diff --git a/Asset/data/asset/functions/artifact/0001.book_of_all-seeing/trigger/find_target_entity.mcfunction b/Asset/data/asset/functions/artifact/0001.book_of_all-seeing/trigger/find_target_entity.mcfunction index 457b60fbde2..20ed9fa3b7e 100644 --- a/Asset/data/asset/functions/artifact/0001.book_of_all-seeing/trigger/find_target_entity.mcfunction +++ b/Asset/data/asset/functions/artifact/0001.book_of_all-seeing/trigger/find_target_entity.mcfunction @@ -15,4 +15,4 @@ execute positioned ~-0.8 ~-0.8 ~-0.8 as @e[type=#lib:living,tag=!this,dx=0,dy=0,dz=0] unless entity @s[type=!player,tag=!Enemy] positioned ~0.6 ~0.6 ~0.6 if entity @s[dx=0,dy=0,dz=0] run tag @s add 01.Target -execute unless entity @e[type=#lib:living,tag=01.Target,distance=..2] positioned ^ ^ ^0.15 if entity @s[distance=..30] if block ~ ~ ~ #lib:no_collision run function asset:artifact/0001.book_of_all-seeing/trigger/find_target_entity +execute unless entity @e[type=#lib:living,tag=01.Target,distance=..2] positioned ^ ^ ^0.15 if entity @s[distance=..30] if block ~ ~ ~ #lib:no_collision/ run function asset:artifact/0001.book_of_all-seeing/trigger/find_target_entity 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 f420c0e38bf..c26a8d88ba6 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 @@ -32,7 +32,7 @@ data modify storage api: Argument.AttackType set value "Physical" # 自分の視線上の1番手前の通過不可のブロック位置に攻撃発生地点AECを移動、ブロックがなかったら6.4ブロック先に移動 - execute as @e[type=area_effect_cloud,tag=5.HitPosition,distance=..1,limit=1] anchored eyes at @s positioned ^ ^ ^3.2 rotated as @e[tag=5.BlockChecker,distance=..0.1,x=0.0,y=0.0,z=0.0,sort=furthest,limit=2] positioned ^ ^ ^1.6 rotated as @e[tag=5.BlockChecker,distance=..0.1,x=0.0,y=0.0,z=0.0,sort=furthest,limit=2] positioned ^ ^ ^0.8 rotated as @e[tag=5.BlockChecker,distance=..0.1,x=0.0,y=0.0,z=0.0,sort=furthest,limit=2] positioned ^ ^ ^0.4 rotated as @e[tag=5.BlockChecker,distance=..0.1,x=0.0,y=0.0,z=0.0,sort=furthest,limit=2] positioned ^ ^ ^0.2 unless block ~ ~ ~ #lib:no_collision run tp @e[type=area_effect_cloud,tag=5.BlockChecker,distance=..0.1,x=0.0,y=0.0,z=0.0] ~ ~ ~ + execute as @e[type=area_effect_cloud,tag=5.HitPosition,distance=..1,limit=1] anchored eyes at @s positioned ^ ^ ^3.2 rotated as @e[tag=5.BlockChecker,distance=..0.1,x=0.0,y=0.0,z=0.0,sort=furthest,limit=2] positioned ^ ^ ^1.6 rotated as @e[tag=5.BlockChecker,distance=..0.1,x=0.0,y=0.0,z=0.0,sort=furthest,limit=2] positioned ^ ^ ^0.8 rotated as @e[tag=5.BlockChecker,distance=..0.1,x=0.0,y=0.0,z=0.0,sort=furthest,limit=2] positioned ^ ^ ^0.4 rotated as @e[tag=5.BlockChecker,distance=..0.1,x=0.0,y=0.0,z=0.0,sort=furthest,limit=2] positioned ^ ^ ^0.2 unless block ~ ~ ~ #lib:no_collision/ run tp @e[type=area_effect_cloud,tag=5.BlockChecker,distance=..0.1,x=0.0,y=0.0,z=0.0] ~ ~ ~ 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の手前にいる敵にダメージ 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 74c1d616cc3..ac2c5fedde5 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 @@ -16,7 +16,7 @@ function api:damage/reset # 敵が空中にいなかったらreturn - execute at @e[type=#lib:living,tag=Victim,tag=!Immovable,distance=..0.01] unless block ~ ~-1 ~ #lib:no_collision run return 0 + execute at @e[type=#lib:living,tag=Victim,tag=!Immovable,distance=..0.01] unless block ~ ~-1 ~ #lib:no_collision/ run return 0 # 落下ダメージ無効化 data modify storage api: Argument set value {ID:190,Duration:60,Stack:10} diff --git a/Asset/data/asset/functions/artifact/0077.swords_of_waterfall_climbing/trigger/attack/dragon_strike/fall_enemy.mcfunction b/Asset/data/asset/functions/artifact/0077.swords_of_waterfall_climbing/trigger/attack/dragon_strike/fall_enemy.mcfunction index d5f8555e4fb..b5f596ba40a 100644 --- a/Asset/data/asset/functions/artifact/0077.swords_of_waterfall_climbing/trigger/attack/dragon_strike/fall_enemy.mcfunction +++ b/Asset/data/asset/functions/artifact/0077.swords_of_waterfall_climbing/trigger/attack/dragon_strike/fall_enemy.mcfunction @@ -14,7 +14,7 @@ particle dust 0.25 0.7 100000000 1.3 ~ ~ ~ 0.5 0.5 0.5 0 5 normal @a # ブロック接触判定 - execute unless block ~ ~-1 ~ #lib:no_collision run tag @s add Landing + execute unless block ~ ~-1 ~ #lib:no_collision/ run tag @s add Landing # 下に落ちる execute if entity @s[tag=!Landing] run tp @s ~ ~-1 ~ diff --git a/Asset/data/asset/functions/artifact/0122.lunatic_lay/trigger/find_through_target/check_through.mcfunction b/Asset/data/asset/functions/artifact/0122.lunatic_lay/trigger/find_through_target/check_through.mcfunction index 48bbc484e3a..4b6736f65fb 100644 --- a/Asset/data/asset/functions/artifact/0122.lunatic_lay/trigger/find_through_target/check_through.mcfunction +++ b/Asset/data/asset/functions/artifact/0122.lunatic_lay/trigger/find_through_target/check_through.mcfunction @@ -5,4 +5,4 @@ # @within function asset:artifact/0122.lunatic_lay/trigger/find_through_target/* execute positioned ~-0.25 ~-0.25 ~-0.25 if entity @s[dx=0] positioned ~-0.5 ~-0.5 ~-0.5 if entity @s[dx=0] run return run tag @s add 3E.Hit -execute positioned ^ ^ ^0.2 if block ^ ^ ^ #lib:no_collision run function asset:artifact/0122.lunatic_lay/trigger/find_through_target/check_through +execute positioned ^ ^ ^0.2 if block ^ ^ ^ #lib:no_collision/ run function asset:artifact/0122.lunatic_lay/trigger/find_through_target/check_through diff --git a/Asset/data/asset/functions/artifact/0172.icicle/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0172.icicle/trigger/3.main.mcfunction index 86efa455a14..4a9663403c2 100644 --- a/Asset/data/asset/functions/artifact/0172.icicle/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/0172.icicle/trigger/3.main.mcfunction @@ -18,4 +18,4 @@ execute store result storage api: Argument.FieldOverride.UserID int 1 run scoreboard players get @s UserID data modify storage api: Argument.FieldOverride.WaitingTick set value 8 data modify storage api: Argument.FieldOverride.Range set value 16 - execute rotated ~ 0 positioned ^ ^6 ^1 if block ~ ~ ~ #lib:no_collision run function api:object/summon + execute rotated ~ 0 positioned ^ ^6 ^1 if block ~ ~ ~ #lib:no_collision/ run function api:object/summon 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 7f9a8016092..58266ad17cb 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 @@ -8,7 +8,7 @@ # 着弾検知 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 unless block ^ ^ ^0.5 #lib:no_collision run tag @s add Landing + execute unless block ^ ^ ^0.5 #lib:no_collision/ run tag @s add Landing # 演出 particle smoke ~ ~ ~ 0 0 0 0 1 diff --git a/Asset/data/asset/functions/artifact/0212.anti_materiel_rifle/trigger/3.2.bullet_landed.mcfunction b/Asset/data/asset/functions/artifact/0212.anti_materiel_rifle/trigger/3.2.bullet_landed.mcfunction index e566da25f1c..e15fc86e242 100644 --- a/Asset/data/asset/functions/artifact/0212.anti_materiel_rifle/trigger/3.2.bullet_landed.mcfunction +++ b/Asset/data/asset/functions/artifact/0212.anti_materiel_rifle/trigger/3.2.bullet_landed.mcfunction @@ -9,6 +9,6 @@ playsound minecraft:entity.generic.explode player @a # ブロック破壊 - execute if predicate api:area/is_breakable unless block ^ ^ ^0.5 #lib:no_collision unless block ^ ^ ^0.5 #lib:unbreakable run setblock ^ ^ ^0.5 air destroy + execute if predicate api:area/is_breakable unless block ^ ^ ^0.5 #lib:no_collision/ unless block ^ ^ ^0.5 #lib:unbreakable run setblock ^ ^ ^0.5 air destroy # アドベンチャー用(仕様決まるまでちょっと保留で) - #execute unless block ^ ^ ^0.5 #lib:no_collision if block ^ ^ ^0.5 spawner if entity @s[gamemode=adventure] run setblock ^ ^ ^0.5 air destroy + #execute unless block ^ ^ ^0.5 #lib:no_collision/ if block ^ ^ ^0.5 spawner if entity @s[gamemode=adventure] run setblock ^ ^ ^0.5 air destroy 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 b66c22696c1..4b41cb33f16 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 @@ -9,7 +9,7 @@ # ここから先は神器側の効果の処理を書く # 着弾検知 execute if entity @e[type=#lib:living,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 unless block ^ ^ ^0.5 #lib:no_collision/ run tag @s add Landing # 演出 particle minecraft:flame ~ ~ ~ 0.1 0.1 0.1 0 5 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 c0c3d46441d..829ee185640 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 @@ -9,7 +9,7 @@ # 着弾検知 execute if entity @e[type=#lib:living,type=!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 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 @@ -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/0376.ray_sorcery/trigger/3.1.shoot.mcfunction b/Asset/data/asset/functions/artifact/0376.ray_sorcery/trigger/3.1.shoot.mcfunction index f63aef501f1..d77e6ea8088 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 @@ -9,7 +9,7 @@ # ここから先は神器側の効果の処理を書く # 着弾検知 execute if entity @e[type=#lib:living,type=!player,tag=!Uninterferable,distance=..2] run tag @s add Landing - execute unless block ^ ^ ^0.5 #lib:no_collision run tag @s add Landing + execute unless block ^ ^ ^0.5 #lib:no_collision/ run tag @s add Landing # 演出 particle dust 1 1 0 1 ~ ~ ~ 0.5 0.5 0.5 0 5 diff --git a/Asset/data/asset/functions/artifact/0397.floor_sublimation_wing/trigger/2.1.check_block.mcfunction b/Asset/data/asset/functions/artifact/0397.floor_sublimation_wing/trigger/2.1.check_block.mcfunction index 2d6113c7cea..8dfa43a25ae 100644 --- a/Asset/data/asset/functions/artifact/0397.floor_sublimation_wing/trigger/2.1.check_block.mcfunction +++ b/Asset/data/asset/functions/artifact/0397.floor_sublimation_wing/trigger/2.1.check_block.mcfunction @@ -13,7 +13,7 @@ execute if block ~ ~ ~ #lib:unbreakable run return fail # 実行位置に条件を満たすブロックがあれば $397_Stat を1に - execute unless block ~ ~ ~ #lib:no_collision if block ~ ~1 ~ #lib:no_collision if block ~ ~2 ~ #lib:no_collision run scoreboard players set $397_Stat Temporary 1 + execute unless block ~ ~ ~ #lib:no_collision/ if block ~ ~1 ~ #lib:no_collision/ if block ~ ~2 ~ #lib:no_collision/ run scoreboard players set $397_Stat Temporary 1 # 位置保存用AEC召喚 execute if score $397_Stat Temporary matches 1 run summon area_effect_cloud ~ ~1 ~ {Tags:["B1.Marker"],Particle:"block air",Radius:0f,Age:-1,Duration:1} 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 b7c44ba27f1..f19c34bd21c 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 @@ -16,4 +16,4 @@ execute if entity @e[type=#lib:living,tag=CZ.HitEntity,distance=..40] run tag @s add CZ.HitFlag # 再帰 - execute positioned ^ ^ ^0.5 if block ~ ~ ~ #lib:no_collision if entity @s[tag=!CZ.HitFlag,distance=..30] run function asset:artifact/0467.cosmo_blue_flash/trigger/shot + execute positioned ^ ^ ^0.5 if block ~ ~ ~ #lib:no_collision/ if entity @s[tag=!CZ.HitFlag,distance=..30] run function asset:artifact/0467.cosmo_blue_flash/trigger/shot diff --git a/Asset/data/asset/functions/artifact/0573.final_prism/trigger/final_laser.mcfunction b/Asset/data/asset/functions/artifact/0573.final_prism/trigger/final_laser.mcfunction index 2b9cfba1f4e..af2832040f5 100644 --- a/Asset/data/asset/functions/artifact/0573.final_prism/trigger/final_laser.mcfunction +++ b/Asset/data/asset/functions/artifact/0573.final_prism/trigger/final_laser.mcfunction @@ -14,7 +14,7 @@ execute if entity @s[distance=..45] positioned ~-0.5 ~-0.5 ~-0.5 run tag @e[tag=Enemy,tag=!Uninterferable,dx=0] add PrismDamage # 前進 - execute if entity @s[distance=..45] if block ~ ~ ~ #lib:no_collision positioned ^ ^ ^0.5 run function asset:artifact/0573.final_prism/trigger/final_laser + execute if entity @s[distance=..45] if block ~ ~ ~ #lib:no_collision/ positioned ^ ^ ^0.5 run function asset:artifact/0573.final_prism/trigger/final_laser # 減速 effect give @s slowness 1 1 true diff --git a/Asset/data/asset/functions/artifact/0573.final_prism/trigger/laser.mcfunction b/Asset/data/asset/functions/artifact/0573.final_prism/trigger/laser.mcfunction index e9c69c87959..bd2aa1ec00d 100644 --- a/Asset/data/asset/functions/artifact/0573.final_prism/trigger/laser.mcfunction +++ b/Asset/data/asset/functions/artifact/0573.final_prism/trigger/laser.mcfunction @@ -19,4 +19,4 @@ execute if entity @s[distance=..45] positioned ~-0.5 ~-0.5 ~-0.5 run tag @e[tag=Enemy,tag=!Uninterferable,dx=0] add PrismDamage # 前進 - execute if entity @s[distance=..45] if block ~ ~ ~ #lib:no_collision positioned ^ ^ ^0.5 run function asset:artifact/0573.final_prism/trigger/laser + execute if entity @s[distance=..45] if block ~ ~ ~ #lib:no_collision/ positioned ^ ^ ^0.5 run function asset:artifact/0573.final_prism/trigger/laser 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 05466914750..986cb5ffc37 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 @@ -11,7 +11,7 @@ # 着弾検知 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 unless block ^ ^ ^0.5 #lib:no_collision 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 @@ -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 3fc34e5e702..d2005f4a312 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 @@ -7,7 +7,7 @@ # asset:artifact/0609.lunar_flare/trigger/find_target_entity # 地形にぶつかったとき - execute unless entity @s[tag=GX.RecursiveEnd] unless block ^ ^ ^1 #lib:no_collision run function asset:artifact/0609.lunar_flare/trigger/summon_laser_pos + execute unless entity @s[tag=GX.RecursiveEnd] unless block ^ ^ ^1 #lib:no_collision/ run function asset:artifact/0609.lunar_flare/trigger/summon_laser_pos # 限界距離なら execute unless entity @s[tag=GX.RecursiveEnd] unless entity @s[distance=..20] run function asset:artifact/0609.lunar_flare/trigger/summon_laser_pos @@ -16,4 +16,4 @@ 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.15 if entity @s[distance=..25] if block ~ ~ ~ #lib:no_collision run function asset:artifact/0609.lunar_flare/trigger/find_target_entity + 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/0796.log4shell/trigger/3.1.shell.mcfunction b/Asset/data/asset/functions/artifact/0796.log4shell/trigger/3.1.shell.mcfunction index b82e0eb79d8..9a5597b7c4b 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 @@ -11,7 +11,7 @@ # 着弾検知 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 unless block ^ ^ ^0.5 #lib:no_collision 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 @@ -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/0820.jewel_rod_of_horai/trigger/check_block_recursive.mcfunction b/Asset/data/asset/functions/artifact/0820.jewel_rod_of_horai/trigger/check_block_recursive.mcfunction index dea1404bbf8..fe06c33ab81 100644 --- a/Asset/data/asset/functions/artifact/0820.jewel_rod_of_horai/trigger/check_block_recursive.mcfunction +++ b/Asset/data/asset/functions/artifact/0820.jewel_rod_of_horai/trigger/check_block_recursive.mcfunction @@ -1,13 +1,13 @@ #> asset:artifact/0820.jewel_rod_of_horai/trigger/check_block_recursive # -# +# # # @within # function asset:artifact/0820.jewel_rod_of_horai/trigger/check_block # function asset:artifact/0820.jewel_rod_of_horai/trigger/check_block_recursive # ブロックに当たってたらフラグ立てる - execute unless block ~ ~ ~ #lib:no_collision run scoreboard players set $MS.BlockDetect Temporary 1 + execute unless block ~ ~ ~ #lib:no_collision/ run scoreboard players set $MS.BlockDetect Temporary 1 # チェック位置が発動者まで達したらループ終了 execute as @p[tag=this] facing entity @s eyes positioned as @s positioned ^ ^ ^3 rotated as 0-0-0-0-0 positioned ^ ^ ^-4 unless entity @s[distance=..5] run scoreboard players set $MS.LoopEnd Temporary 1 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 60f6c895d7e..307106d691e 100644 --- a/Asset/data/asset/functions/artifact/0876.uni/trigger/bullet.mcfunction +++ b/Asset/data/asset/functions/artifact/0876.uni/trigger/bullet.mcfunction @@ -10,7 +10,7 @@ # 着弾検知 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 unless block ^ ^ ^0.5 #lib:no_collision 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 @@ -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/0905.book_of_metastasis/trigger/5.bullet.mcfunction b/Asset/data/asset/functions/artifact/0905.book_of_metastasis/trigger/5.bullet.mcfunction index be8157e7fcc..6872a01140f 100644 --- a/Asset/data/asset/functions/artifact/0905.book_of_metastasis/trigger/5.bullet.mcfunction +++ b/Asset/data/asset/functions/artifact/0905.book_of_metastasis/trigger/5.bullet.mcfunction @@ -9,7 +9,7 @@ #declare tag P5.Landing # 着弾検知 - execute unless entity @s[tag=P5.Landing] unless block ^ ^ ^0.5 #lib:no_collision run tag @s add P5.Landing + execute unless entity @s[tag=P5.Landing] unless block ^ ^ ^0.5 #lib:no_collision/ run tag @s add P5.Landing # 演出 particle minecraft:scrape ~ ~ ~ 0.1 0.1 0.1 0 1 force @@ -22,4 +22,4 @@ execute at @s store result score $isBanTPArea Temporary if predicate lib:is_ban_tp_area execute if score $isBanTPArea Temporary matches 1 at @s run particle smoke ~ ~ ~ 0 0 0 0.1 30 execute if score $isBanTPArea Temporary matches 1 run kill @s - scoreboard players reset $isBanTPArea Temporary \ No newline at end of file + scoreboard players reset $isBanTPArea Temporary 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 db96dc99fcc..dda8dd6affc 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 @@ -8,7 +8,7 @@ # 着弾検知 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 unless block ^ ^ ^0.5 #lib:no_collision 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 @@ -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 e83064e8fc5..b98953f5135 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 @@ -20,4 +20,4 @@ execute if entity @e[type=#lib:living,type=!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 + 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 332edacce86..0057c68a62a 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 @@ -10,7 +10,7 @@ # 着弾検知 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 unless block ^ ^ ^0.5 #lib:no_collision 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 diff --git a/Asset/data/asset/functions/artifact/0987.ghost_step/trigger/5.bullet.mcfunction b/Asset/data/asset/functions/artifact/0987.ghost_step/trigger/5.bullet.mcfunction index 4f1224ac679..a9aa44bec99 100644 --- a/Asset/data/asset/functions/artifact/0987.ghost_step/trigger/5.bullet.mcfunction +++ b/Asset/data/asset/functions/artifact/0987.ghost_step/trigger/5.bullet.mcfunction @@ -15,8 +15,8 @@ execute if score @s RF.Age matches ..50 run tp @s ^ ^ ^0.25 ~ ~ # 壁に埋まってるかどうかで色を変える - execute at @s if block ~ ~ ~ #lib:no_collision run data modify entity @s glow_color_override set value 5308671 - execute at @s unless block ~ ~ ~ #lib:no_collision run data modify entity @s glow_color_override set value 16724787 + execute at @s if block ~ ~ ~ #lib:no_collision/ run data modify entity @s glow_color_override set value 5308671 + execute at @s unless block ~ ~ ~ #lib:no_collision/ run data modify entity @s glow_color_override set value 16724787 # 5s 経ったら kill execute if score @s RF.Age matches 100.. run kill @s 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 e0fd5b913fe..d351effedbd 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 @@ -24,5 +24,5 @@ scoreboard players add @s Temporary 1 # 再帰で前に飛ばす。ヒットしてたら移動停止 - execute if entity @s[tag=!SG.Hit,distance=..18] if block ~ ~ ~ #lib:no_collision positioned ^ ^ ^1 run function asset:artifact/1024.brave_rod/trigger/combo/laser + execute if entity @s[tag=!SG.Hit,distance=..18] if block ~ ~ ~ #lib:no_collision/ positioned ^ ^ ^1 run function asset:artifact/1024.brave_rod/trigger/combo/laser tag @s[tag=SG.Hit] remove SG.Hit 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 8a344c530da..daa10486946 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 @@ -23,5 +23,5 @@ scoreboard players add @s Temporary 1 # 再帰で前に飛ばす。ヒットしてたら移動停止 - execute if entity @s[tag=!SG.Hit,distance=..25] if block ~ ~ ~ #lib:no_collision positioned ^ ^ ^1 run function asset:artifact/1024.brave_rod/trigger/combo/laser_finish + execute if entity @s[tag=!SG.Hit,distance=..25] if block ~ ~ ~ #lib:no_collision/ positioned ^ ^ ^1 run function asset:artifact/1024.brave_rod/trigger/combo/laser_finish tag @s[tag=SG.Hit] remove SG.Hit diff --git a/Asset/data/asset/functions/artifact/1043.gamma_ray/trigger/6.1.loop.mcfunction b/Asset/data/asset/functions/artifact/1043.gamma_ray/trigger/6.1.loop.mcfunction index 9436f5d5348..95b280e64cc 100644 --- a/Asset/data/asset/functions/artifact/1043.gamma_ray/trigger/6.1.loop.mcfunction +++ b/Asset/data/asset/functions/artifact/1043.gamma_ray/trigger/6.1.loop.mcfunction @@ -10,4 +10,4 @@ execute positioned ~-0.5 ~-0.5 ~-0.5 run tag @e[tag=Enemy,tag=!Uninterferable,dx=0] add SZ.Landing # 再帰 - execute positioned ^ ^ ^0.5 if block ~ ~ ~ #lib:no_collision if entity @s[distance=..24] run function asset:artifact/1043.gamma_ray/trigger/6.1.loop \ No newline at end of file + execute positioned ^ ^ ^0.5 if block ~ ~ ~ #lib:no_collision/ if entity @s[distance=..24] run function asset:artifact/1043.gamma_ray/trigger/6.1.loop diff --git a/Asset/data/asset/functions/artifact/1048.thunder_storm/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/1048.thunder_storm/trigger/3.main.mcfunction index 4c92c9d6372..aae8da8a300 100644 --- a/Asset/data/asset/functions/artifact/1048.thunder_storm/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/1048.thunder_storm/trigger/3.main.mcfunction @@ -27,7 +27,7 @@ summon marker ~ ~ ~ {Tags:["T4.Marker"]} execute anchored eyes run tp @e[type=marker,tag=T4.Marker,distance=..30,sort=nearest,limit=1] ^ ^ ^ ~ ~ scoreboard players set $T4.Temp Temporary 64 - execute as @e[type=marker,tag=T4.Marker,distance=..30,sort=nearest,limit=1] at @s positioned ^ ^ ^0.25 if block ^ ^ ^ #lib:no_collision run function asset:artifact/1048.thunder_storm/trigger/recursive + execute as @e[type=marker,tag=T4.Marker,distance=..30,sort=nearest,limit=1] at @s positioned ^ ^ ^0.25 if block ^ ^ ^ #lib:no_collision/ run function asset:artifact/1048.thunder_storm/trigger/recursive # Markerの位置で召喚 data modify storage api: Argument.ID set value 1044 diff --git a/Asset/data/asset/functions/artifact/1048.thunder_storm/trigger/recursive.mcfunction b/Asset/data/asset/functions/artifact/1048.thunder_storm/trigger/recursive.mcfunction index 8ffc89114e0..d0352e6f899 100644 --- a/Asset/data/asset/functions/artifact/1048.thunder_storm/trigger/recursive.mcfunction +++ b/Asset/data/asset/functions/artifact/1048.thunder_storm/trigger/recursive.mcfunction @@ -11,4 +11,4 @@ # 再帰 scoreboard players remove $T4.Temp Temporary 1 - execute at @s positioned ^ ^ ^0.25 if block ^ ^ ^ #lib:no_collision if score $T4.Temp Temporary matches 1.. run function asset:artifact/1048.thunder_storm/trigger/recursive + execute at @s positioned ^ ^ ^0.25 if block ^ ^ ^ #lib:no_collision/ if score $T4.Temp Temporary matches 1.. run function asset:artifact/1048.thunder_storm/trigger/recursive diff --git a/Asset/data/asset/functions/artifact/1076.death_snap/trigger/shot.mcfunction b/Asset/data/asset/functions/artifact/1076.death_snap/trigger/shot.mcfunction index eac849e51db..2fbca5d2a8e 100644 --- a/Asset/data/asset/functions/artifact/1076.death_snap/trigger/shot.mcfunction +++ b/Asset/data/asset/functions/artifact/1076.death_snap/trigger/shot.mcfunction @@ -10,7 +10,7 @@ execute if score $TW.Count Temporary matches 0 run return fail # 着弾検知 execute positioned ~-0.5 ~-0.5 ~-0.5 if entity @p[tag=this,dx=0] run tag @s add TW.Landing - execute unless block ^ ^ ^0.5 #lib:no_collision run tag @s add TW.Landing + execute unless block ^ ^ ^0.5 #lib:no_collision/ run tag @s add TW.Landing # ターゲットにダメージ execute positioned ~-0.5 ~-0.5 ~-0.5 if entity @p[tag=this,dx=0] unless score $TW.Count Temporary matches 0 run function asset:artifact/1076.death_snap/trigger/hit 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 6de47aa72ab..62e2fcee9d9 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 @@ -8,7 +8,7 @@ # 着弾検知 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 unless block ^ ^ ^0.5 #lib:no_collision 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 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 0ee8d17365a..d29765e88d3 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 @@ -9,7 +9,7 @@ # ここから先は神器側の効果の処理を書く # 着弾検知 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 unless block ^ ^ ^0.5 #lib:no_collision 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 diff --git a/Asset/data/asset/functions/artifact/1176.b_l_e_s_s/trigger/block_check_recursive.mcfunction b/Asset/data/asset/functions/artifact/1176.b_l_e_s_s/trigger/block_check_recursive.mcfunction index 84d8d5026b5..a2c07e845b2 100644 --- a/Asset/data/asset/functions/artifact/1176.b_l_e_s_s/trigger/block_check_recursive.mcfunction +++ b/Asset/data/asset/functions/artifact/1176.b_l_e_s_s/trigger/block_check_recursive.mcfunction @@ -1,15 +1,15 @@ #> asset:artifact/1176.b_l_e_s_s/trigger/block_check_recursive # -# +# # # @within # function asset:artifact/1176.b_l_e_s_s/trigger/block_check # function asset:artifact/1176.b_l_e_s_s/trigger/block_check_recursive # ブロックに当たってたらフラグ立てる -execute unless block ~ ~ ~ #lib:no_collision run scoreboard players set $WO.BlockDetect Temporary 1 - #execute unless block ~ ~ ~ #lib:no_collision run say collision - #execute unless block ~ ~ ~ #lib:no_collision run tellraw @p [{"score": {"name": "$WO.LoopNum","objective": "Temporary"}}] +execute unless block ~ ~ ~ #lib:no_collision/ run scoreboard players set $WO.BlockDetect Temporary 1 + #execute unless block ~ ~ ~ #lib:no_collision/ run say collision + #execute unless block ~ ~ ~ #lib:no_collision/ run tellraw @p [{"score": {"name": "$WO.LoopNum","objective": "Temporary"}}] # チェック位置が発動者まで達したらループ終了 execute as @p[tag=this] facing entity @s eyes positioned as @s positioned ^ ^ ^3 rotated as 0-0-0-0-0 positioned ^ ^ ^-4 unless entity @s[distance=..5] run scoreboard players set $WO.LoopEnd Temporary 1 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 7d14b998622..5fe961c5a86 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 @@ -10,4 +10,4 @@ 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 if entity @s[distance=..24] positioned ^ ^ ^0.5 if block ~ ~ ~ #lib:no_collision run function asset:artifact/1177.spinnrade/trigger/search_target + 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/1183.cosmo_site/trigger/shot.mcfunction b/Asset/data/asset/functions/artifact/1183.cosmo_site/trigger/shot.mcfunction index 44dedc71fe5..0246552f526 100644 --- a/Asset/data/asset/functions/artifact/1183.cosmo_site/trigger/shot.mcfunction +++ b/Asset/data/asset/functions/artifact/1183.cosmo_site/trigger/shot.mcfunction @@ -7,7 +7,7 @@ # asset:artifact/1183.cosmo_site/trigger/shot # 着弾検知 - execute unless block ^ ^ ^0.5 #lib:no_collision run tag @s add Landing + execute unless block ^ ^ ^0.5 #lib:no_collision/ run tag @s add Landing execute if entity @s[tag=!Landing,distance=29..] run tag @s add Landing # 演出 particle minecraft:composter ~ ~ ~ 0.1 0.1 0.1 0 1 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 4bbe1f82a05..42f58bccbb4 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 @@ -15,7 +15,7 @@ # ダメージ # 敵が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,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 data modify storage api: Argument.AttackType set value "Physical" data modify storage api: Argument.ElementType set value "Thunder" function api:damage/modifier @@ -23,7 +23,7 @@ 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,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/ # リセット scoreboard players reset $Recursive Temporary diff --git a/Asset/data/asset/functions/artifact/1205.electric_fly_swatter/trigger/dragon_strike/.mcfunction b/Asset/data/asset/functions/artifact/1205.electric_fly_swatter/trigger/dragon_strike/.mcfunction index dd11e562b58..9bd02c80a58 100644 --- a/Asset/data/asset/functions/artifact/1205.electric_fly_swatter/trigger/dragon_strike/.mcfunction +++ b/Asset/data/asset/functions/artifact/1205.electric_fly_swatter/trigger/dragon_strike/.mcfunction @@ -16,7 +16,7 @@ scoreboard players add $Recursive Temporary 1 # 下がブロックの時の演出 - execute at @s unless block ~ ~-0.5 ~ #lib:no_collision_without_fluid run function asset:artifact/1205.electric_fly_swatter/trigger/dragon_strike/vfx + execute at @s unless block ~ ~-0.5 ~ #lib:no_collision/without_fluid run function asset:artifact/1205.electric_fly_swatter/trigger/dragon_strike/vfx # 下がブロックでなければ再帰 - execute if score $Recursive Temporary matches ..60 at @s if block ~ ~-0.5 ~ #lib:no_collision_without_fluid positioned ~ ~-0.5 ~ run function asset:artifact/1205.electric_fly_swatter/trigger/dragon_strike/ + execute if score $Recursive Temporary matches ..60 at @s if block ~ ~-0.5 ~ #lib:no_collision/without_fluid positioned ~ ~-0.5 ~ run function asset:artifact/1205.electric_fly_swatter/trigger/dragon_strike/ 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 ab25e2bb475..e61ae7cb196 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 @@ -7,7 +7,7 @@ # asset:artifact/1208.secret_art_waterfall/trigger/recursive # 0.25ブロック先がブロック - execute if entity @s[tag=!Check] unless block ^ ^ ^0.25 #lib:no_collision run function asset:artifact/1208.secret_art_waterfall/trigger/summon_object + execute if entity @s[tag=!Check] unless block ^ ^ ^0.25 #lib:no_collision/ run function asset:artifact/1208.secret_art_waterfall/trigger/summon_object # 一定以上再帰 execute if entity @s[tag=!Check] if score $Recursive Temporary matches 16.. run function asset:artifact/1208.secret_art_waterfall/trigger/summon_object 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 4aa5e9876ea..1e66dba1ed1 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 @@ -10,4 +10,4 @@ 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 if entity @s[distance=..20] positioned ^ ^ ^0.5 if block ~ ~ ~ #lib:no_collision run function asset:artifact/1217.archer_fish/trigger/search_target + 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/1230.thunder_stiletto/trigger/check_foot.mcfunction b/Asset/data/asset/functions/artifact/1230.thunder_stiletto/trigger/check_foot.mcfunction index 38205c74345..3449d5c1e4f 100644 --- a/Asset/data/asset/functions/artifact/1230.thunder_stiletto/trigger/check_foot.mcfunction +++ b/Asset/data/asset/functions/artifact/1230.thunder_stiletto/trigger/check_foot.mcfunction @@ -5,8 +5,8 @@ # @within function asset:artifact/1230.thunder_stiletto/trigger/3.main # 2ブロック下までチェック - execute unless block ~ ~-1 ~ #lib:no_collision_without_fluid run return fail - execute unless block ~ ~-2 ~ #lib:no_collision_without_fluid run return fail + execute unless block ~ ~-1 ~ #lib:no_collision/without_fluid run return fail + execute unless block ~ ~-2 ~ #lib:no_collision/without_fluid run return fail # 成功 return 1 diff --git a/Asset/data/asset/functions/artifact/1253.wool_shooter/trigger/shoot.mcfunction b/Asset/data/asset/functions/artifact/1253.wool_shooter/trigger/shoot.mcfunction index ca7f5196c15..d80c70106da 100644 --- a/Asset/data/asset/functions/artifact/1253.wool_shooter/trigger/shoot.mcfunction +++ b/Asset/data/asset/functions/artifact/1253.wool_shooter/trigger/shoot.mcfunction @@ -7,7 +7,7 @@ # asset:artifact/1253.wool_shooter/trigger/shoot # 着弾検知 - execute unless block ^ ^ ^ #lib:no_collision run tag @s add Landing + execute unless block ^ ^ ^ #lib:no_collision/ run tag @s add Landing # 羊毛は例外 execute if block ^ ^ ^ #wool run tag @s remove Landing # プレイヤーより周囲1mは除外（ただし、岩盤とかはのぞく diff --git a/Asset/data/asset/functions/artifact/1253.wool_shooter/trigger/shoot_45.mcfunction b/Asset/data/asset/functions/artifact/1253.wool_shooter/trigger/shoot_45.mcfunction index 2d3c3473b9d..fd712bd0ba9 100644 --- a/Asset/data/asset/functions/artifact/1253.wool_shooter/trigger/shoot_45.mcfunction +++ b/Asset/data/asset/functions/artifact/1253.wool_shooter/trigger/shoot_45.mcfunction @@ -7,7 +7,7 @@ # asset:artifact/1253.wool_shooter/trigger/shoot_45 # 着弾検知 - execute unless block ^ ^ ^ #lib:no_collision run tag @s add Landing + execute unless block ^ ^ ^ #lib:no_collision/ run tag @s add Landing # 羊毛は例外 execute if block ^ ^ ^ #wool run tag @s remove Landing # プレイヤーより周囲1mは除外（ただし、岩盤とかはのぞく 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 e21ff945f59..44de990f12c 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 @@ -7,7 +7,7 @@ # asset:artifact/1257.thor_staff/trigger/recursive # 0.25ブロック先がブロック - execute if entity @s[tag=!Check] unless block ^ ^ ^0.25 #lib:no_collision run function asset:artifact/1257.thor_staff/trigger/summon_object + execute if entity @s[tag=!Check] unless block ^ ^ ^0.25 #lib:no_collision/ run function asset:artifact/1257.thor_staff/trigger/summon_object # 一定以上再帰 execute if entity @s[tag=!Check] if score $Recursive Temporary matches 16.. run function asset:artifact/1257.thor_staff/trigger/summon_object 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 0645b0566f9..a8573ea34ab 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 @@ -7,7 +7,7 @@ # asset:artifact/1260.rod_of_light_orb/trigger/recursive # 0.25ブロック先がブロック - execute if entity @s[tag=!Check] unless block ^ ^ ^0.25 #lib:no_collision run function asset:artifact/1260.rod_of_light_orb/trigger/summon_object + execute if entity @s[tag=!Check] unless block ^ ^ ^0.25 #lib:no_collision/ run function asset:artifact/1260.rod_of_light_orb/trigger/summon_object # 一定以上再帰 execute if entity @s[tag=!Check] if score $Recursive Temporary matches 16.. run function asset:artifact/1260.rod_of_light_orb/trigger/summon_object 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 a726c6c7019..102bdc77b83 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 @@ -7,7 +7,7 @@ # asset:artifact/1265.thunder_ray/trigger/recursive # 0.25ブロック先がブロック - execute if entity @s[tag=!Check] unless block ^ ^ ^0.25 #lib:no_collision run function asset:artifact/1265.thunder_ray/trigger/thunder + execute if entity @s[tag=!Check] unless block ^ ^ ^0.25 #lib:no_collision/ run function asset:artifact/1265.thunder_ray/trigger/thunder # 一定以上再帰 execute if entity @s[tag=!Check] if score $Recursive Temporary matches 48.. run function asset:artifact/1265.thunder_ray/trigger/thunder 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 5f84113f6b1..4a07cc56aa7 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 @@ -13,11 +13,11 @@ # ヒットしたら対象に着弾検知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 # 距離が来るor壁が来た場合、着弾タグをつける - execute unless block ^ ^ ^0.6 #lib:no_collision run tag @s add Landing + execute unless block ^ ^ ^0.6 #lib:no_collision/ run tag @s add Landing execute unless entity @s[distance=..15] run tag @s add Landing # ダメージを与える execute if entity @s[tag=Landing] run function asset:effect/0320.fatalerror_charge/end/charge_shot/landing # 再帰 - execute if entity @s[tag=!Landing] positioned ^ ^ ^0.6 if block ^ ^ ^ #lib:no_collision run function asset:effect/0320.fatalerror_charge/end/charge_shot/loop + execute if entity @s[tag=!Landing] positioned ^ ^ ^0.6 if block ^ ^ ^ #lib:no_collision/ run function asset:effect/0320.fatalerror_charge/end/charge_shot/loop 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 6395670c231..acab722ec52 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 @@ -17,4 +17,4 @@ execute if entity @s[tag=Landing] run function asset:effect/0320.fatalerror_charge/end/shot/landing # 再帰 - execute if entity @s[tag=!Landing] positioned ^ ^ ^0.6 if entity @s[distance=..15] if block ^ ^ ^ #lib:no_collision run function asset:effect/0320.fatalerror_charge/end/shot/loop + execute if entity @s[tag=!Landing] positioned ^ ^ ^0.6 if entity @s[distance=..15] if block ^ ^ ^ #lib:no_collision/ run function asset:effect/0320.fatalerror_charge/end/shot/loop diff --git a/Asset/data/asset/functions/mob/0021.demon_eye/tick/.mcfunction b/Asset/data/asset/functions/mob/0021.demon_eye/tick/.mcfunction index 35e41285406..541ea0fb936 100644 --- a/Asset/data/asset/functions/mob/0021.demon_eye/tick/.mcfunction +++ b/Asset/data/asset/functions/mob/0021.demon_eye/tick/.mcfunction @@ -30,7 +30,7 @@ execute unless score @s L.AttackCT matches 1.. positioned ~-0.5 ~-0.5 ~-0.5 if entity @p[tag=!PlayerShouldInvulnerable,dx=0] at @s run function asset:mob/0021.demon_eye/tick/event/attack # カベにぶつかった際の処理 - execute unless block ^ ^ ^0.5 #lib:no_collision as @e[type=area_effect_cloud,tag=21.Rotater,sort=nearest,limit=1] run tp @s ~ ~ ~ ~45 ~-45 + execute unless block ^ ^ ^0.5 #lib:no_collision/ as @e[type=area_effect_cloud,tag=21.Rotater,sort=nearest,limit=1] run tp @s ~ ~ ~ ~45 ~-45 # 世界に存在しすぎた場合、消滅する scoreboard players remove @s L.LifeTime 1 diff --git a/Asset/data/asset/functions/mob/0027.skull_sniper/tick/attack/shot/detect_block.mcfunction b/Asset/data/asset/functions/mob/0027.skull_sniper/tick/attack/shot/detect_block.mcfunction index 805d1ab6577..ba07caa78f3 100644 --- a/Asset/data/asset/functions/mob/0027.skull_sniper/tick/attack/shot/detect_block.mcfunction +++ b/Asset/data/asset/functions/mob/0027.skull_sniper/tick/attack/shot/detect_block.mcfunction @@ -1,4 +1,4 @@ #> asset:mob/0027.skull_sniper/tick/attack/shot/detect_block # @within function asset:mob/0027.skull_sniper/tick/attack/shot/rec -execute unless block ~ ~ ~ #lib:no_collision run data modify storage asset:temp Projectile.IsHitBlock set value true +execute unless block ~ ~ ~ #lib:no_collision/ run data modify storage asset:temp Projectile.IsHitBlock set value true diff --git a/Asset/data/asset/functions/mob/0027.skull_sniper/tick/target/.mcfunction b/Asset/data/asset/functions/mob/0027.skull_sniper/tick/target/.mcfunction index 3784a59c379..d758acedb92 100644 --- a/Asset/data/asset/functions/mob/0027.skull_sniper/tick/target/.mcfunction +++ b/Asset/data/asset/functions/mob/0027.skull_sniper/tick/target/.mcfunction @@ -12,4 +12,4 @@ execute if data storage asset:context this.Target run particle minecraft:dust 0.58 0 0 0.75 ~ ~ ~ 0 0 0 0 1 execute if entity @s[dx=0] run return run function asset:mob/0027.skull_sniper/tick/target/fetch -execute positioned ^ ^ ^0.5 if block ^ ^ ^ #lib:no_collision run return run function asset:mob/0027.skull_sniper/tick/target/ +execute positioned ^ ^ ^0.5 if block ^ ^ ^ #lib:no_collision/ run return run function asset:mob/0027.skull_sniper/tick/target/ diff --git a/Asset/data/asset/functions/mob/0038.laser_eye/tick/shoot/recursive.mcfunction b/Asset/data/asset/functions/mob/0038.laser_eye/tick/shoot/recursive.mcfunction index a0b4288044b..2fc3ab236b6 100644 --- a/Asset/data/asset/functions/mob/0038.laser_eye/tick/shoot/recursive.mcfunction +++ b/Asset/data/asset/functions/mob/0038.laser_eye/tick/shoot/recursive.mcfunction @@ -15,7 +15,7 @@ # 着弾検知 execute positioned ~-0.5 ~-0.5 ~-0.5 if entity @p[tag=!PlayerShouldInvulnerable,dx=0] run tag @s add Landing - execute unless block ^ ^ ^0.5 #lib:no_collision 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 run tag @p[tag=!PlayerShouldInvulnerable,dx=0,sort=random,limit=1] add LandingTarget diff --git a/Asset/data/asset/functions/mob/0046.clock_of_despair/tick/skill/common/beam/loop.mcfunction b/Asset/data/asset/functions/mob/0046.clock_of_despair/tick/skill/common/beam/loop.mcfunction index 7157093ec9a..5424e1a1b23 100644 --- a/Asset/data/asset/functions/mob/0046.clock_of_despair/tick/skill/common/beam/loop.mcfunction +++ b/Asset/data/asset/functions/mob/0046.clock_of_despair/tick/skill/common/beam/loop.mcfunction @@ -13,7 +13,7 @@ # ビーム終端検知 execute if entity @a[tag=!PlayerShouldInvulnerable,distance=..1] run tag @s add Landing - execute unless block ^ ^ ^1 #lib:no_collision run tag @s add Landing + execute unless block ^ ^ ^1 #lib:no_collision/ run tag @s add Landing # ターゲットにタグ付与 tag @a[tag=!PlayerShouldInvulnerable,distance=..1] add LandingTarget diff --git a/Asset/data/asset/functions/mob/0053.executioners/attack/.mcfunction b/Asset/data/asset/functions/mob/0053.executioners/attack/.mcfunction index 8533eebed13..f1df7f80b5c 100644 --- a/Asset/data/asset/functions/mob/0053.executioners/attack/.mcfunction +++ b/Asset/data/asset/functions/mob/0053.executioners/attack/.mcfunction @@ -37,7 +37,7 @@ execute at @p[tag=Victim,distance=..50] run summon marker ~ ~ ~ {Tags:["SpreadMarker"]} execute at @p[tag=Victim,distance=..50] run data modify storage lib: Argument.Bounds set value [[4d,4d],[0d,0d],[4d,4d]] execute as @e[type=marker,tag=SpreadMarker,distance=..60,limit=1] at @s run function lib:spread_entity/ - execute at @e[type=marker,tag=SpreadMarker,distance=..60,limit=1] if block ~ ~ ~ #lib:no_collision_without_fluid unless block ~ ~-1 ~ #lib:no_collision_without_fluid run tp @s ~ ~ ~ + execute at @e[type=marker,tag=SpreadMarker,distance=..60,limit=1] if block ~ ~ ~ #lib:no_collision/without_fluid unless block ~ ~-1 ~ #lib:no_collision/without_fluid run tp @s ~ ~ ~ # リセット data remove storage lib: Argument diff --git a/Asset/data/asset/functions/mob/0055.hetukedah/tick/skill/charge/move_forward.mcfunction b/Asset/data/asset/functions/mob/0055.hetukedah/tick/skill/charge/move_forward.mcfunction index 372e5557323..1ddd7dae311 100644 --- a/Asset/data/asset/functions/mob/0055.hetukedah/tick/skill/charge/move_forward.mcfunction +++ b/Asset/data/asset/functions/mob/0055.hetukedah/tick/skill/charge/move_forward.mcfunction @@ -28,7 +28,7 @@ execute if predicate api:global_vars/difficulty/min/3_blessless if predicate api:area/is_breakable rotated ~ 0 positioned ^ ^ ^1 run function asset:mob/0055.hetukedah/tick/skill/charge/break_block # 壁があったら終了 - execute unless block ^ ^ ^1 #lib:no_collision run scoreboard players set @s General.Mob.Tick 50 + execute unless block ^ ^ ^1 #lib:no_collision/ run scoreboard players set @s General.Mob.Tick 50 # 前に移動 - execute if block ^ ^ ^1 #lib:no_collision run tp @s ^ ^ ^1 + execute if block ^ ^ ^1 #lib:no_collision/ run tp @s ^ ^ ^1 diff --git a/Asset/data/asset/functions/mob/0055.hetukedah/tick/skill/otete_beam/beam/.mcfunction b/Asset/data/asset/functions/mob/0055.hetukedah/tick/skill/otete_beam/beam/.mcfunction index d7deca3a50a..181156497c1 100644 --- a/Asset/data/asset/functions/mob/0055.hetukedah/tick/skill/otete_beam/beam/.mcfunction +++ b/Asset/data/asset/functions/mob/0055.hetukedah/tick/skill/otete_beam/beam/.mcfunction @@ -15,7 +15,7 @@ execute positioned ~-0.5 ~-0.5 ~-0.5 if entity @a[tag=!PlayerShouldInvulnerable,dx=0] positioned ~0.5 ~0.5 ~0.5 run function asset:mob/0055.hetukedah/tick/skill/otete_beam/beam/hit # 壁ヒットで炸裂 - execute unless block ^ ^ ^1 #lib:no_collision run function asset:mob/0055.hetukedah/tick/skill/otete_beam/beam/hit + execute unless block ^ ^ ^1 #lib:no_collision/ run function asset:mob/0055.hetukedah/tick/skill/otete_beam/beam/hit # 壁がなかったり、プレイヤーにあたったりしなければ再帰 - execute if entity @s[distance=..30] positioned ~-0.5 ~-0.5 ~-0.5 unless entity @a[tag=!PlayerShouldInvulnerable,dx=0] positioned ~0.5 ~0.5 ~0.5 positioned ^ ^ ^1 if block ~ ~ ~ #lib:no_collision run function asset:mob/0055.hetukedah/tick/skill/otete_beam/beam/ + execute if entity @s[distance=..30] positioned ~-0.5 ~-0.5 ~-0.5 unless entity @a[tag=!PlayerShouldInvulnerable,dx=0] positioned ~0.5 ~0.5 ~0.5 positioned ^ ^ ^1 if block ~ ~ ~ #lib:no_collision/ run function asset:mob/0055.hetukedah/tick/skill/otete_beam/beam/ diff --git a/Asset/data/asset/functions/mob/0055.hetukedah/tick/skill/otete_beam/big_beam/.mcfunction b/Asset/data/asset/functions/mob/0055.hetukedah/tick/skill/otete_beam/big_beam/.mcfunction index 6c5f041a855..416d4bf7a71 100644 --- a/Asset/data/asset/functions/mob/0055.hetukedah/tick/skill/otete_beam/big_beam/.mcfunction +++ b/Asset/data/asset/functions/mob/0055.hetukedah/tick/skill/otete_beam/big_beam/.mcfunction @@ -15,7 +15,7 @@ execute positioned ~-0.5 ~-0.5 ~-0.5 if entity @a[tag=!PlayerShouldInvulnerable,dx=0] positioned ~0.5 ~0.5 ~0.5 run function asset:mob/0055.hetukedah/tick/skill/otete_beam/big_beam/hit # 壁ヒットで炸裂 - execute unless block ^ ^ ^1 #lib:no_collision run function asset:mob/0055.hetukedah/tick/skill/otete_beam/big_beam/hit + execute unless block ^ ^ ^1 #lib:no_collision/ run function asset:mob/0055.hetukedah/tick/skill/otete_beam/big_beam/hit # 壁がなかったり、プレイヤーにあたったりしなければ再帰 - execute if entity @s[distance=..30] positioned ~-0.5 ~-0.5 ~-0.5 unless entity @a[tag=!PlayerShouldInvulnerable,dx=0] positioned ~0.5 ~0.5 ~0.5 positioned ^ ^ ^1 if block ~ ~ ~ #lib:no_collision run function asset:mob/0055.hetukedah/tick/skill/otete_beam/big_beam/ + execute if entity @s[distance=..30] positioned ~-0.5 ~-0.5 ~-0.5 unless entity @a[tag=!PlayerShouldInvulnerable,dx=0] positioned ~0.5 ~0.5 ~0.5 positioned ^ ^ ^1 if block ~ ~ ~ #lib:no_collision/ run function asset:mob/0055.hetukedah/tick/skill/otete_beam/big_beam/ diff --git a/Asset/data/asset/functions/mob/0056.thunder_trifler/hurt/teleport.mcfunction b/Asset/data/asset/functions/mob/0056.thunder_trifler/hurt/teleport.mcfunction index 19acd8592cc..35cb1c41a26 100644 --- a/Asset/data/asset/functions/mob/0056.thunder_trifler/hurt/teleport.mcfunction +++ b/Asset/data/asset/functions/mob/0056.thunder_trifler/hurt/teleport.mcfunction @@ -15,7 +15,7 @@ execute at @p[tag=Attacker,distance=..50] run summon marker ~ ~ ~ {Tags:["SpreadMarker"]} execute at @p[tag=Attacker,distance=..50] run data modify storage lib: Argument.Bounds set value [[5d,5d],[0d,0d],[5d,5d]] execute as @e[type=marker,tag=SpreadMarker,distance=..60,limit=1] at @s run function lib:spread_entity/ - execute at @e[type=marker,tag=SpreadMarker,distance=..60,limit=1] if block ~ ~ ~ #lib:no_collision_without_fluid unless block ~ ~-1 ~ #lib:no_collision_without_fluid run tp @s ~ ~ ~ + execute at @e[type=marker,tag=SpreadMarker,distance=..60,limit=1] if block ~ ~ ~ #lib:no_collision/without_fluid unless block ~ ~-1 ~ #lib:no_collision/without_fluid run tp @s ~ ~ ~ # 武器が剣の場合弓に切替 execute if entity @s[tag=1K.Sword] if predicate api:global_vars/difficulty/max/2_hard run item replace entity @s weapon.mainhand with bow diff --git a/Asset/data/asset/functions/mob/0059.jack_o_lantern/tick/skill/spread_tp.mcfunction b/Asset/data/asset/functions/mob/0059.jack_o_lantern/tick/skill/spread_tp.mcfunction index 2899a00328f..faa0bfd0acb 100644 --- a/Asset/data/asset/functions/mob/0059.jack_o_lantern/tick/skill/spread_tp.mcfunction +++ b/Asset/data/asset/functions/mob/0059.jack_o_lantern/tick/skill/spread_tp.mcfunction @@ -8,7 +8,7 @@ summon marker ~ ~ ~ {Tags:["SpreadMarker"]} execute at @e[type=marker,tag=1N.SpawnMarker,distance=..50] run data modify storage lib: Argument.Bounds set value [[5d,5d],[0d,0d],[5d,5d]] execute as @e[type=marker,tag=SpreadMarker,distance=..50,limit=1] at @s run function lib:spread_entity/ - execute at @e[type=marker,tag=SpreadMarker,distance=..50,limit=1] if block ~ ~ ~ #lib:no_collision_without_fluid unless block ~ ~-1 ~ #lib:no_collision_without_fluid run tp @s ~ ~ ~ + execute at @e[type=marker,tag=SpreadMarker,distance=..50,limit=1] if block ~ ~ ~ #lib:no_collision/without_fluid unless block ~ ~-1 ~ #lib:no_collision/without_fluid run tp @s ~ ~ ~ # tpする tp @e[type=marker,tag=SpreadMarker,distance=..50] ~ ~ ~ diff --git a/Asset/data/asset/functions/mob/0073.clutch_spider/tick/skill/shot.mcfunction b/Asset/data/asset/functions/mob/0073.clutch_spider/tick/skill/shot.mcfunction index db59104d682..1d2d1fb1290 100644 --- a/Asset/data/asset/functions/mob/0073.clutch_spider/tick/skill/shot.mcfunction +++ b/Asset/data/asset/functions/mob/0073.clutch_spider/tick/skill/shot.mcfunction @@ -7,7 +7,7 @@ # asset:mob/0073.clutch_spider/tick/skill/shot # 着弾検知 - execute unless block ^ ^ ^2 #lib:no_collision run tag @s add Landing + execute unless block ^ ^ ^2 #lib:no_collision/ run tag @s add Landing execute if entity @p[gamemode=!spectator,distance=..3] run tag @s add Landing execute if entity @p[gamemode=!spectator,distance=..3] at @p[gamemode=!spectator,distance=..3] run particle cloud ~ ~1.5 ~ 0.6 0.4 0.6 0 30 normal @a diff --git a/Asset/data/asset/functions/mob/0078.messenger_of_thunder/tick/.mcfunction b/Asset/data/asset/functions/mob/0078.messenger_of_thunder/tick/.mcfunction index 2f63ddbbc8a..e7fb4589651 100644 --- a/Asset/data/asset/functions/mob/0078.messenger_of_thunder/tick/.mcfunction +++ b/Asset/data/asset/functions/mob/0078.messenger_of_thunder/tick/.mcfunction @@ -26,7 +26,7 @@ # ハメ対策でのtp処理 # スキル中は使用不可 # ハメ対策 - execute if entity @s[scores={General.Mob.Tick=..-1,26.TPCool=..0}] unless block ~ ~ ~ #lib:no_collision_without_fluid unless block ~ ~ ~ #walls run tag @s add 26.Teleport + execute if entity @s[scores={General.Mob.Tick=..-1,26.TPCool=..0}] unless block ~ ~ ~ #lib:no_collision/without_fluid unless block ~ ~ ~ #walls run tag @s add 26.Teleport # tpする execute if entity @s[tag=26.Teleport] run function asset:mob/0078.messenger_of_thunder/tick/teleport diff --git a/Asset/data/asset/functions/mob/0078.messenger_of_thunder/tick/skill/teleport_spread/spread.mcfunction b/Asset/data/asset/functions/mob/0078.messenger_of_thunder/tick/skill/teleport_spread/spread.mcfunction index 7fa4c99a027..05f99256256 100644 --- a/Asset/data/asset/functions/mob/0078.messenger_of_thunder/tick/skill/teleport_spread/spread.mcfunction +++ b/Asset/data/asset/functions/mob/0078.messenger_of_thunder/tick/skill/teleport_spread/spread.mcfunction @@ -19,10 +19,10 @@ execute as @e[type=marker,tag=SpreadMarker,distance=..15] at @s run function lib:spread_entity/ # 拡散後の位置に足場がなければMarkerを消してreturnする - execute at @e[type=marker,tag=SpreadMarker,distance=..15] if block ~ ~-1 ~ #lib:no_collision_without_fluid run return run kill @e[type=marker,tag=SpreadMarker,distance=..0.01] + execute at @e[type=marker,tag=SpreadMarker,distance=..15] if block ~ ~-1 ~ #lib:no_collision/without_fluid run return run kill @e[type=marker,tag=SpreadMarker,distance=..0.01] # 拡散後の位置に足場があればワープ - execute at @e[type=marker,tag=SpreadMarker,distance=..15] unless block ~ ~-1 ~ #lib:no_collision_without_fluid run tp @s ~ ~ ~ + execute at @e[type=marker,tag=SpreadMarker,distance=..15] unless block ~ ~-1 ~ #lib:no_collision/without_fluid run tp @s ~ ~ ~ # 演出 playsound block.respawn_anchor.charge hostile @a ~ ~ ~ 0.5 2 0 diff --git a/Asset/data/asset/functions/mob/0081.snow_cloud/tick/.mcfunction b/Asset/data/asset/functions/mob/0081.snow_cloud/tick/.mcfunction index 148e179d673..23223d08f6e 100644 --- a/Asset/data/asset/functions/mob/0081.snow_cloud/tick/.mcfunction +++ b/Asset/data/asset/functions/mob/0081.snow_cloud/tick/.mcfunction @@ -12,11 +12,11 @@ particle dust 1 1000000000 1000000000 2 ~ ~ ~ 0.6 0.3 0.6 0 2 normal @a # 最も近いプレイヤーの上に移動 - execute facing entity @p[gamemode=!spectator,distance=..30] feet rotated ~ 0 if block ^ ^ ^0.2 #lib:no_collision run tp @s ^ ^ ^0.1 - execute if entity @a[gamemode=!spectator,distance=..4] if block ~ ~1 ~ #lib:no_collision run tp @s ~ ~1 ~ + execute facing entity @p[gamemode=!spectator,distance=..30] feet rotated ~ 0 if block ^ ^ ^0.2 #lib:no_collision/ run tp @s ^ ^ ^0.1 + execute if entity @a[gamemode=!spectator,distance=..4] if block ~ ~1 ~ #lib:no_collision/ run tp @s ~ ~1 ~ # プレイヤーの上に移動しすぎたら降下(下30ブロック以内にプレイヤーがいて、下6ブロック以内にプレイヤーがいない場合降下) - execute positioned ~-1 ~-30 ~-1 if entity @a[gamemode=!spectator,dx=2,dy=30,dz=2] at @s positioned ~-1 ~-6 ~-1 unless entity @a[gamemode=!spectator,dx=2,dy=6,dz=2] at @s if block ~ ~-1 ~ #lib:no_collision run tp @s ~ ~-1 ~ + execute positioned ~-1 ~-30 ~-1 if entity @a[gamemode=!spectator,dx=2,dy=30,dz=2] at @s positioned ~-1 ~-6 ~-1 unless entity @a[gamemode=!spectator,dx=2,dy=6,dz=2] at @s if block ~ ~-1 ~ #lib:no_collision/ run tp @s ~ ~-1 ~ # 一定周期の特殊能力(分岐functionに記載) execute if score @s 29.SnowTick matches 60.. run function asset:mob/0081.snow_cloud/tick/snowing diff --git a/Asset/data/asset/functions/mob/0081.snow_cloud/tick/check_block.mcfunction b/Asset/data/asset/functions/mob/0081.snow_cloud/tick/check_block.mcfunction index 2e7f9980cb7..a05bfa8b0fc 100644 --- a/Asset/data/asset/functions/mob/0081.snow_cloud/tick/check_block.mcfunction +++ b/Asset/data/asset/functions/mob/0081.snow_cloud/tick/check_block.mcfunction @@ -10,4 +10,4 @@ execute if entity @e[type=polar_bear,scores={MobID=81},distance=..1] at @s run function asset:mob/0081.snow_cloud/tick/snow_damage # 再帰ループ - execute unless entity @e[type=polar_bear,scores={MobID=81},distance=..1] if block ~ ~1 ~ #lib:no_collision_without_fluid positioned ~ ~1 ~ run function asset:mob/0081.snow_cloud/tick/check_block + execute unless entity @e[type=polar_bear,scores={MobID=81},distance=..1] if block ~ ~1 ~ #lib:no_collision/without_fluid positioned ~ ~1 ~ run function asset:mob/0081.snow_cloud/tick/check_block diff --git a/Asset/data/asset/functions/mob/0106.mini_shulker/tick/target/.mcfunction b/Asset/data/asset/functions/mob/0106.mini_shulker/tick/target/.mcfunction index 359f0af4faa..d5331899bb4 100644 --- a/Asset/data/asset/functions/mob/0106.mini_shulker/tick/target/.mcfunction +++ b/Asset/data/asset/functions/mob/0106.mini_shulker/tick/target/.mcfunction @@ -12,4 +12,4 @@ # asset:mob/0106.mini_shulker/tick/target/ execute if entity @s[dx=0] summon marker run return run function asset:mob/0106.mini_shulker/tick/target/fetch -execute positioned ^ ^ ^0.2 if block ^ ^ ^ #lib:no_collision run function asset:mob/0106.mini_shulker/tick/target/ +execute positioned ^ ^ ^0.2 if block ^ ^ ^ #lib:no_collision/ run function asset:mob/0106.mini_shulker/tick/target/ diff --git a/Asset/data/asset/functions/mob/0106.mini_shulker/tick/teleport/secure/rec.m.mcfunction b/Asset/data/asset/functions/mob/0106.mini_shulker/tick/teleport/secure/rec.m.mcfunction index 258f0409c3d..a951beb6655 100644 --- a/Asset/data/asset/functions/mob/0106.mini_shulker/tick/teleport/secure/rec.m.mcfunction +++ b/Asset/data/asset/functions/mob/0106.mini_shulker/tick/teleport/secure/rec.m.mcfunction @@ -5,7 +5,7 @@ # asset:mob/0106.mini_shulker/tick/teleport/secure/rec.m # 安全な壁ならTP候補に追加 - $execute if block ~ ~ ~ #lib:no_collision unless block $(Direction) #lib:no_collision summon marker run function asset:mob/0106.mini_shulker/tick/teleport/secure/append + $execute if block ~ ~ ~ #lib:no_collision/ unless block $(Direction) #lib:no_collision/ summon marker run function asset:mob/0106.mini_shulker/tick/teleport/secure/append # RemainingRangeを減らす execute store result storage asset:temp 2Y.Secure.RemainingRange int 0.9999999999 run data get storage asset:temp 2Y.Secure.RemainingRange 1 diff --git a/Asset/data/asset/functions/mob/0123.lexiel_v3/tick/common/spread_tp.mcfunction b/Asset/data/asset/functions/mob/0123.lexiel_v3/tick/common/spread_tp.mcfunction index ac2f21e8da5..cae13b6fd56 100644 --- a/Asset/data/asset/functions/mob/0123.lexiel_v3/tick/common/spread_tp.mcfunction +++ b/Asset/data/asset/functions/mob/0123.lexiel_v3/tick/common/spread_tp.mcfunction @@ -11,10 +11,10 @@ function lib:spread_entity/ # 埋まり対策（これで埋まってたら知らん） - execute at @s unless block ~ ~ ~ #lib:no_collision run data modify storage lib: Argument.Bounds set value [[3d,3d],[0d,0d],[3d,3d]] - execute at @s unless block ~ ~ ~ #lib:no_collision run function lib:spread_entity/ - execute at @s unless block ~ ~ ~ #lib:no_collision run data modify storage lib: Argument.Bounds set value [[3d,3d],[0d,0d],[3d,3d]] - execute at @s unless block ~ ~ ~ #lib:no_collision run function lib:spread_entity/ + execute at @s unless block ~ ~ ~ #lib:no_collision/ run data modify storage lib: Argument.Bounds set value [[3d,3d],[0d,0d],[3d,3d]] + execute at @s unless block ~ ~ ~ #lib:no_collision/ run function lib:spread_entity/ + execute at @s unless block ~ ~ ~ #lib:no_collision/ run data modify storage lib: Argument.Bounds set value [[3d,3d],[0d,0d],[3d,3d]] + execute at @s unless block ~ ~ ~ #lib:no_collision/ run function lib:spread_entity/ # ディスプレイもってくる用 execute at @s run function asset:mob/0123.lexiel_v3/tick/common/tp diff --git a/Asset/data/asset/functions/mob/0123.lexiel_v3/tick/common/tp.mcfunction b/Asset/data/asset/functions/mob/0123.lexiel_v3/tick/common/tp.mcfunction index d55d52192de..d8e5c0204b5 100644 --- a/Asset/data/asset/functions/mob/0123.lexiel_v3/tick/common/tp.mcfunction +++ b/Asset/data/asset/functions/mob/0123.lexiel_v3/tick/common/tp.mcfunction @@ -5,6 +5,6 @@ # @within function asset:mob/0123.lexiel_v3/**/**/** # 自身をその場所まで持っていく(雑床埋まり対策もする) - execute if block ~ ~ ~ #lib:no_collision run tp @s ~ ~ ~ ~ ~ - execute unless block ~ ~ ~ #lib:no_collision run tp @s ~ ~0.1 ~ ~ ~ + execute if block ~ ~ ~ #lib:no_collision/ run tp @s ~ ~ ~ ~ ~ + execute unless block ~ ~ ~ #lib:no_collision/ run tp @s ~ ~0.1 ~ ~ ~ execute at @s rotated ~ 0 run tp @e[type=item_display,tag=3F.AJ,tag=3F.AJLink,distance=..100,sort=nearest,limit=1] ~ ~ ~ ~ ~ diff --git a/Asset/data/asset/functions/mob/0138.combat_turret/tick/2.3.shot.mcfunction b/Asset/data/asset/functions/mob/0138.combat_turret/tick/2.3.shot.mcfunction index f1d65ff6fa3..71e2ef237d5 100644 --- a/Asset/data/asset/functions/mob/0138.combat_turret/tick/2.3.shot.mcfunction +++ b/Asset/data/asset/functions/mob/0138.combat_turret/tick/2.3.shot.mcfunction @@ -8,7 +8,7 @@ # 着弾検知 execute if entity @a[gamemode=!spectator,distance=..2] run tag @s add Landing - execute unless block ^ ^ ^0.5 #lib:no_collision run tag @s add Landing + execute unless block ^ ^ ^0.5 #lib:no_collision/ run tag @s add Landing # ターゲットにタグ付与 execute if entity @a[gamemode=!spectator,distance=..2] run tag @p[gamemode=!spectator,distance=..2] add LandingTarget diff --git a/Asset/data/asset/functions/mob/0155.immorality/tick/shot/recursive.mcfunction b/Asset/data/asset/functions/mob/0155.immorality/tick/shot/recursive.mcfunction index 1838ac3d5f7..f608cf676f0 100644 --- a/Asset/data/asset/functions/mob/0155.immorality/tick/shot/recursive.mcfunction +++ b/Asset/data/asset/functions/mob/0155.immorality/tick/shot/recursive.mcfunction @@ -7,7 +7,7 @@ # asset:mob/0155.immorality/tick/shot/recursive # 着弾検知 - execute unless block ^ ^ ^0.25 #lib:no_collision run tag @s add Landing + execute unless block ^ ^ ^0.25 #lib:no_collision/ run tag @s add Landing # ターゲットにタグ付与 execute positioned ~-0.5 ~-0.5 ~-0.5 run tag @p[gamemode=!spectator,dx=0] add LandingTarget diff --git a/Asset/data/asset/functions/mob/0175.queen_bee/tick/skill/beebomb/.mcfunction b/Asset/data/asset/functions/mob/0175.queen_bee/tick/skill/beebomb/.mcfunction index 78a09d0f321..a4e5d8ce764 100644 --- a/Asset/data/asset/functions/mob/0175.queen_bee/tick/skill/beebomb/.mcfunction +++ b/Asset/data/asset/functions/mob/0175.queen_bee/tick/skill/beebomb/.mcfunction @@ -16,11 +16,11 @@ execute if score @s General.Mob.Tick matches 13..15 rotated ~ -90 positioned ^ ^ ^1 run function asset:mob/0175.queen_bee/tick/common/tp/ execute if score @s General.Mob.Tick matches 15..25 rotated ~ -90 positioned ^ ^ ^0.3 run function asset:mob/0175.queen_bee/tick/common/tp/ # 上が壁ならスコアスキップ - execute if score @s General.Mob.Tick matches 10..25 unless block ~ ~2 ~ #lib:no_collision run scoreboard players set @s General.Mob.Tick 25 + execute if score @s General.Mob.Tick matches 10..25 unless block ~ ~2 ~ #lib:no_collision/ run scoreboard players set @s General.Mob.Tick 25 # 回転しながら進む - execute if score @s General.Mob.Tick matches 25..125 at @s rotated ~6 0 positioned ^ ^ ^1 if block ~ ~ ~ #lib:no_collision run function asset:mob/0175.queen_bee/tick/common/tp/ - execute if score @s General.Mob.Tick matches 25..125 at @s rotated ~6 0 positioned ^ ^ ^1 unless block ~ ~ ~ #lib:no_collision run function asset:mob/0175.queen_bee/tick/skill/beebomb/wall_hit + execute if score @s General.Mob.Tick matches 25..125 at @s rotated ~6 0 positioned ^ ^ ^1 if block ~ ~ ~ #lib:no_collision/ run function asset:mob/0175.queen_bee/tick/common/tp/ + execute if score @s General.Mob.Tick matches 25..125 at @s rotated ~6 0 positioned ^ ^ ^1 unless block ~ ~ ~ #lib:no_collision/ run function asset:mob/0175.queen_bee/tick/skill/beebomb/wall_hit # 一定時間追尾する execute if score @s General.Mob.Tick matches 25..125 at @s if entity @p[gamemode=!spectator,distance=10..100] facing entity @p[gamemode=!spectator,distance=..100] eyes positioned ^ ^ ^-100 rotated as @s positioned ^ ^ ^-300 facing entity @s eyes positioned as @s rotated ~ 0 positioned ^ ^ ^0.6 run function asset:mob/0175.queen_bee/tick/common/tp/ # 中央マーカーから離れ過ぎたら向きを変える diff --git a/Asset/data/asset/functions/mob/0175.queen_bee/tick/skill/grandslam/.mcfunction b/Asset/data/asset/functions/mob/0175.queen_bee/tick/skill/grandslam/.mcfunction index 98835936100..89aa113ad64 100644 --- a/Asset/data/asset/functions/mob/0175.queen_bee/tick/skill/grandslam/.mcfunction +++ b/Asset/data/asset/functions/mob/0175.queen_bee/tick/skill/grandslam/.mcfunction @@ -32,8 +32,8 @@ execute if score @s General.Mob.Tick matches 75..85 at @s rotated ~ 90 positioned ^ ^ ^2 run function asset:mob/0175.queen_bee/tick/common/tp/ # 一定距離落下したあと、地面にぶつかると爆発する - execute if score @s General.Mob.Tick matches 75..85 at @s unless block ~ ~-1 ~ #lib:no_collision run function asset:mob/0175.queen_bee/tick/skill/grandslam/block_hit - execute if score @s General.Mob.Tick matches 75..85 at @s unless block ~ ~-2 ~ #lib:no_collision run function asset:mob/0175.queen_bee/tick/skill/grandslam/block_hit + execute if score @s General.Mob.Tick matches 75..85 at @s unless block ~ ~-1 ~ #lib:no_collision/ run function asset:mob/0175.queen_bee/tick/skill/grandslam/block_hit + execute if score @s General.Mob.Tick matches 75..85 at @s unless block ~ ~-2 ~ #lib:no_collision/ run function asset:mob/0175.queen_bee/tick/skill/grandslam/block_hit # 演出 execute if score @s General.Mob.Tick matches 75..85 at @s run function asset:mob/0175.queen_bee/tick/skill/grandslam/vfx diff --git a/Asset/data/asset/functions/mob/0175.queen_bee/tick/skill/grandslam/alart/main.mcfunction b/Asset/data/asset/functions/mob/0175.queen_bee/tick/skill/grandslam/alart/main.mcfunction index 72aa71ddedf..25be5d9710e 100644 --- a/Asset/data/asset/functions/mob/0175.queen_bee/tick/skill/grandslam/alart/main.mcfunction +++ b/Asset/data/asset/functions/mob/0175.queen_bee/tick/skill/grandslam/alart/main.mcfunction @@ -6,5 +6,5 @@ # asset:mob/0175.queen_bee/tick/skill/grandslam/ # asset:mob/0175.queen_bee/tick/skill/grandslam/alart/main -execute unless block ^ ^ ^0.5 #lib:no_collision run function asset:mob/0175.queen_bee/tick/skill/grandslam/alart/landing -execute positioned ^ ^ ^0.5 if block ^ ^ ^ #lib:no_collision run return run function asset:mob/0175.queen_bee/tick/skill/grandslam/alart/main +execute unless block ^ ^ ^0.5 #lib:no_collision/ run function asset:mob/0175.queen_bee/tick/skill/grandslam/alart/landing +execute positioned ^ ^ ^0.5 if block ^ ^ ^ #lib:no_collision/ run return run function asset:mob/0175.queen_bee/tick/skill/grandslam/alart/main diff --git a/Asset/data/asset/functions/mob/0175.queen_bee/tick/skill/reset.mcfunction b/Asset/data/asset/functions/mob/0175.queen_bee/tick/skill/reset.mcfunction index b00ebe2874f..aeaae45cd62 100644 --- a/Asset/data/asset/functions/mob/0175.queen_bee/tick/skill/reset.mcfunction +++ b/Asset/data/asset/functions/mob/0175.queen_bee/tick/skill/reset.mcfunction @@ -23,5 +23,5 @@ execute on passengers positioned as @s run tp @s ~ ~ ~ ~ 0 # ブロックに埋まってたり、距離が遠すぎたらしたらテレポートする - execute unless block ~ ~ ~ #lib:no_collision run function asset:mob/0175.queen_bee/tick/common/tp/spread_teleport + execute unless block ~ ~ ~ #lib:no_collision/ run function asset:mob/0175.queen_bee/tick/common/tp/spread_teleport execute unless entity @p[gamemode=!spectator,distance=..15] run function asset:mob/0175.queen_bee/tick/common/tp/spread_teleport diff --git a/Asset/data/asset/functions/mob/0204.infernal_watcher/tick/move/do.m.mcfunction b/Asset/data/asset/functions/mob/0204.infernal_watcher/tick/move/do.m.mcfunction index 09cbf985cdc..65a2c3fafda 100644 --- a/Asset/data/asset/functions/mob/0204.infernal_watcher/tick/move/do.m.mcfunction +++ b/Asset/data/asset/functions/mob/0204.infernal_watcher/tick/move/do.m.mcfunction @@ -5,7 +5,7 @@ # @within function asset:mob/0204.infernal_watcher/tick/move/ # 遮蔽がない場合は最寄りのプレイヤーを追いかける - $execute facing entity @a[distance=..64,sort=nearest,limit=1] feet positioned ^ ^ ^-100 rotated as @s positioned ^ ^ ^-$(Range) facing entity @s eyes positioned as @s anchored eyes if block ^ ^ ^$(Speed) #lib:no_collision anchored feet run return run tp @s ^ ^ ^$(Speed) ~ ~ + $execute facing entity @a[distance=..64,sort=nearest,limit=1] feet positioned ^ ^ ^-100 rotated as @s positioned ^ ^ ^-$(Range) facing entity @s eyes positioned as @s anchored eyes if block ^ ^ ^$(Speed) #lib:no_collision/ anchored feet run return run tp @s ^ ^ ^$(Speed) ~ ~ # 遮蔽がある場合は跳ね返る diff --git a/Asset/data/asset/functions/mob/0206.skull_basher/tick/.mcfunction b/Asset/data/asset/functions/mob/0206.skull_basher/tick/.mcfunction index 875754f1491..e110b2d8363 100644 --- a/Asset/data/asset/functions/mob/0206.skull_basher/tick/.mcfunction +++ b/Asset/data/asset/functions/mob/0206.skull_basher/tick/.mcfunction @@ -14,4 +14,4 @@ # バックステップ、フロントステップ execute if entity @a[distance=..20] run scoreboard players add @s 5Q.MoveTime 1 - execute facing entity @p[distance=..20] eyes rotated ~ 0 unless block ^ ^-1 ^3 #lib:no_collision if score @s 5Q.MoveTime matches 40.. run function asset:mob/0206.skull_basher/tick/event/step + execute facing entity @p[distance=..20] eyes rotated ~ 0 unless block ^ ^-1 ^3 #lib:no_collision/ if score @s 5Q.MoveTime matches 40.. run function asset:mob/0206.skull_basher/tick/event/step diff --git a/Asset/data/asset/functions/mob/0210.aurora_eye/tick/.mcfunction b/Asset/data/asset/functions/mob/0210.aurora_eye/tick/.mcfunction index 71499402891..f8d7944519c 100644 --- a/Asset/data/asset/functions/mob/0210.aurora_eye/tick/.mcfunction +++ b/Asset/data/asset/functions/mob/0210.aurora_eye/tick/.mcfunction @@ -11,12 +11,12 @@ execute facing entity @p[gamemode=!spectator] feet positioned ^ ^ ^-100 rotated as @s positioned ^ ^ ^-800 facing entity @s feet positioned as @s run tp @s ^ ^ ^0.2 ~ ~ # 接地で上を向く - execute at @s unless block ~ ~0.4 ~ #lib:no_collision at @s run tp @s ~ ~ ~ ~ ~-35 - execute at @s unless block ~ ~2.5 ~ #lib:no_collision at @s run tp @s ~ ~ ~ ~ ~80 + execute at @s unless block ~ ~0.4 ~ #lib:no_collision/ at @s run tp @s ~ ~ ~ ~ ~-35 + execute at @s unless block ~ ~2.5 ~ #lib:no_collision/ at @s run tp @s ~ ~ ~ ~ ~80 # カベにぶつかった際の処理 - execute at @s unless block ^ ^ ^0.3 #lib:no_collision at @s run tp @s ~ ~ ~ ~45 ~-45 - execute at @s unless block ^ ^ ^0.2 #lib:no_collision at @s run tp @s ~ ~ ~ ~45 ~-45 + execute at @s unless block ^ ^ ^0.3 #lib:no_collision/ at @s run tp @s ~ ~ ~ ~45 ~-45 + execute at @s unless block ^ ^ ^0.2 #lib:no_collision/ at @s run tp @s ~ ~ ~ ~45 ~-45 # 近接攻撃 execute store result storage asset:context this.AttackCT._ int 0.9999999999 run data get storage asset:context this.AttackCT._ diff --git a/Asset/data/asset/functions/mob/0227.frost_eye/tick/.mcfunction b/Asset/data/asset/functions/mob/0227.frost_eye/tick/.mcfunction index 97d55fd5c2f..ca2b65c08cf 100644 --- a/Asset/data/asset/functions/mob/0227.frost_eye/tick/.mcfunction +++ b/Asset/data/asset/functions/mob/0227.frost_eye/tick/.mcfunction @@ -11,11 +11,11 @@ execute if predicate api:area/is_breakable anchored eyes positioned ^ ^ ^ run fill ~0.5 ~-1 ~0.5 ~-0.5 ~-2 ~-0.5 frosted_ice replace #asset:mob/0227.frost_eye/freezable # 接地で上を向く - execute at @s unless block ~ ~0.2 ~ #lib:no_collision run tp @s ~ ~ ~ ~ ~-35 - execute at @s unless block ~ ~2.5 ~ #lib:no_collision run tp @s ~ ~ ~ ~ ~80 + execute at @s unless block ~ ~0.2 ~ #lib:no_collision/ run tp @s ~ ~ ~ ~ ~-35 + execute at @s unless block ~ ~2.5 ~ #lib:no_collision/ run tp @s ~ ~ ~ ~ ~80 # カベにぶつかった際の処理 - execute at @s unless block ^ ^ ^0.3 #lib:no_collision run tp @s ~ ~ ~ ~45 ~-45 + execute at @s unless block ^ ^ ^0.3 #lib:no_collision/ run tp @s ~ ~ ~ ~45 ~-45 # プレイヤーを追跡 execute at @s facing entity @p[gamemode=!spectator] feet positioned ^ ^ ^-100 rotated as @s positioned ^ ^ ^-800 facing entity @s feet positioned as @s run tp @s ^ ^ ^0.15 ~ ~ diff --git a/Asset/data/asset/functions/mob/0232.honey_leader/tick/skill/beam/recursive.mcfunction b/Asset/data/asset/functions/mob/0232.honey_leader/tick/skill/beam/recursive.mcfunction index fbc6a68e882..d63068a8433 100644 --- a/Asset/data/asset/functions/mob/0232.honey_leader/tick/skill/beam/recursive.mcfunction +++ b/Asset/data/asset/functions/mob/0232.honey_leader/tick/skill/beam/recursive.mcfunction @@ -14,4 +14,4 @@ execute positioned ~-0.5 ~ ~-0.5 if entity @a[gamemode=!spectator,dx=0] run tag @a[tag=!PlayerShouldInvulnerable,dx=0] add LandingTarget # 再帰 - execute if entity @s[distance=..32] positioned ^ ^ ^1 if block ~ ~ ~ #lib:no_collision run function asset:mob/0232.honey_leader/tick/skill/beam/recursive + execute if entity @s[distance=..32] positioned ^ ^ ^1 if block ~ ~ ~ #lib:no_collision/ run function asset:mob/0232.honey_leader/tick/skill/beam/recursive diff --git a/Asset/data/asset/functions/mob/0234.walleye/tick/2.2.move.mcfunction b/Asset/data/asset/functions/mob/0234.walleye/tick/2.2.move.mcfunction index 38ecc749176..3bf0a338c4f 100644 --- a/Asset/data/asset/functions/mob/0234.walleye/tick/2.2.move.mcfunction +++ b/Asset/data/asset/functions/mob/0234.walleye/tick/2.2.move.mcfunction @@ -8,6 +8,6 @@ execute at @s run tp @s ^ ^ ^0.5 execute at @s run tp @s ^ ^ ^0.5 execute at @s positioned ~ ~1.5 ~ positioned ^ ^ ^-1 run particle poof ~ ~ ~ 0 0 0 0.005 1 - execute at @s unless block ~ ~ ~ #lib:no_collision run scoreboard players set @s 6i.Phase 2 + execute at @s unless block ~ ~ ~ #lib:no_collision/ run scoreboard players set @s 6i.Phase 2 execute at @s if entity @e[tag=Friend,distance=..1] run scoreboard players set @s 6i.Phase 2 execute positioned ~ -64 ~ if entity @s[dy=-128] run scoreboard players set @s 6i.Phase 2 diff --git a/Asset/data/asset/functions/mob/0237.lunatic_mage/tick/skill/fire/.mcfunction b/Asset/data/asset/functions/mob/0237.lunatic_mage/tick/skill/fire/.mcfunction index 97dc5ca813b..3cf81543e6d 100644 --- a/Asset/data/asset/functions/mob/0237.lunatic_mage/tick/skill/fire/.mcfunction +++ b/Asset/data/asset/functions/mob/0237.lunatic_mage/tick/skill/fire/.mcfunction @@ -20,7 +20,7 @@ execute if entity @s[scores={General.Mob.Tick=20}] facing entity @p[gamemode=!spectator,distance=..32] eyes run tp @s ~ ~ ~ ~ ~ # 空中なら降りる - execute if entity @s[scores={General.Mob.Tick=20..}] if block ~ ~-0.2 ~ #lib:no_collision_without_fluid run tp @s ~ ~-0.2 ~ + execute if entity @s[scores={General.Mob.Tick=20..}] if block ~ ~-0.2 ~ #lib:no_collision/without_fluid run tp @s ~ ~-0.2 ~ # 実行時間を移す execute if entity @s[scores={General.Mob.Tick=20..}] run scoreboard players operation $Interval Temporary = @s General.Mob.Tick diff --git a/Asset/data/asset/functions/mob/0255.dependence_eye/tick/.mcfunction b/Asset/data/asset/functions/mob/0255.dependence_eye/tick/.mcfunction index f2cefc4cb30..c1c9d94e3ea 100644 --- a/Asset/data/asset/functions/mob/0255.dependence_eye/tick/.mcfunction +++ b/Asset/data/asset/functions/mob/0255.dependence_eye/tick/.mcfunction @@ -10,8 +10,8 @@ particle dust 0.5 0 0 1 ~ ~1.68 ~ 0.25 0.25 0.25 0 2 force @a[distance=..40] # 接地で上を向く - execute unless block ~ ~-0.1 ~ #lib:no_collision at @s run tp @s ~ ~ ~ ~ ~-35 - execute unless block ~ ~1 ~ #lib:no_collision at @s run tp @s ~ ~ ~ ~ ~80 + execute unless block ~ ~-0.1 ~ #lib:no_collision/ at @s run tp @s ~ ~ ~ ~ ~-35 + execute unless block ~ ~1 ~ #lib:no_collision/ at @s run tp @s ~ ~ ~ ~ ~80 # 範囲内ならホーミングじみた移動、ただしダメージを受けていないなら execute facing entity @p eyes positioned ^ ^ ^-100 rotated as @s positioned ^ ^ ^-800 facing entity @s eyes positioned as @s run tp @s ^ ^ ^0.25 ~ ~ @@ -23,5 +23,5 @@ execute unless score @s 73.AttackCT matches 1.. positioned ~-0.5 ~-0.5 ~-0.5 if entity @p[tag=!PlayerShouldInvulnerable,dx=0] run function asset:mob/0255.dependence_eye/tick/3.attack # カベにぶつかった際の処理 - execute unless block ^ ^ ^0.5 #lib:no_collision at @s run tp @s ~ ~ ~ ~45 ~-45 - execute at @s unless block ^ ^ ^0.2 #lib:no_collision at @s run tp @s ~ ~ ~ ~45 ~-45 + execute unless block ^ ^ ^0.5 #lib:no_collision/ at @s run tp @s ~ ~ ~ ~45 ~-45 + execute at @s unless block ^ ^ ^0.2 #lib:no_collision/ at @s run tp @s ~ ~ ~ ~45 ~-45 diff --git a/Asset/data/asset/functions/mob/0257.distortion_spellbook/hurt/teleport.mcfunction b/Asset/data/asset/functions/mob/0257.distortion_spellbook/hurt/teleport.mcfunction index 8366940f70c..e525b4abc44 100644 --- a/Asset/data/asset/functions/mob/0257.distortion_spellbook/hurt/teleport.mcfunction +++ b/Asset/data/asset/functions/mob/0257.distortion_spellbook/hurt/teleport.mcfunction @@ -17,7 +17,7 @@ execute as @e[type=marker,tag=SpreadMarker,distance=..0.01,limit=1] at @s run function lib:spread_entity/ # マーカーの位置にブロックがなかったらテレポートする - execute at @e[type=marker,tag=SpreadMarker,distance=..13,limit=1] if block ~ ~ ~ #lib:no_collision run tp @s ~ ~ ~ + execute at @e[type=marker,tag=SpreadMarker,distance=..13,limit=1] if block ~ ~ ~ #lib:no_collision/ run tp @s ~ ~ ~ # リセット kill @e[type=marker,tag=SpreadMarker,distance=..13,limit=1] diff --git a/Asset/data/asset/functions/mob/0257.distortion_spellbook/tick/.mcfunction b/Asset/data/asset/functions/mob/0257.distortion_spellbook/tick/.mcfunction index 645366cec66..dc350ef8f99 100644 --- a/Asset/data/asset/functions/mob/0257.distortion_spellbook/tick/.mcfunction +++ b/Asset/data/asset/functions/mob/0257.distortion_spellbook/tick/.mcfunction @@ -11,8 +11,8 @@ particle enchant ~ ~1.68 ~ 0.25 0.25 0.25 0 2 force @a[distance=..40] # 接地で上を向く - execute unless block ~ ~-0.1 ~ #lib:no_collision at @s run tp @s ~ ~ ~ ~ ~-35 - execute unless block ~ ~1 ~ #lib:no_collision at @s run tp @s ~ ~ ~ ~ ~80 + execute unless block ~ ~-0.1 ~ #lib:no_collision/ at @s run tp @s ~ ~ ~ ~ ~-35 + execute unless block ~ ~1 ~ #lib:no_collision/ at @s run tp @s ~ ~ ~ ~ ~80 # 範囲内ならホーミングじみた移動 execute facing entity @p eyes positioned ^ ^ ^-100 rotated as @s positioned ^ ^ ^-800 facing entity @s eyes positioned as @s run tp @s ^ ^ ^0.2 ~ ~ @@ -25,5 +25,5 @@ execute if score @s General.Mob.Tick matches 135.. run scoreboard players set @s General.Mob.Tick 0 # カベにぶつかった際の処理 - execute unless block ^ ^ ^0.5 #lib:no_collision at @s run tp @s ~ ~ ~ ~45 ~-45 - execute at @s unless block ^ ^ ^0.2 #lib:no_collision at @s run tp @s ~ ~ ~ ~45 ~-45 + execute unless block ^ ^ ^0.5 #lib:no_collision/ at @s run tp @s ~ ~ ~ ~45 ~-45 + execute at @s unless block ^ ^ ^0.2 #lib:no_collision/ at @s run tp @s ~ ~ ~ ~45 ~-45 diff --git a/Asset/data/asset/functions/mob/0261.laser_eye_mk2/tick/.mcfunction b/Asset/data/asset/functions/mob/0261.laser_eye_mk2/tick/.mcfunction index 9c26fe7eb10..bd666857eaf 100644 --- a/Asset/data/asset/functions/mob/0261.laser_eye_mk2/tick/.mcfunction +++ b/Asset/data/asset/functions/mob/0261.laser_eye_mk2/tick/.mcfunction @@ -15,10 +15,10 @@ execute if entity @s[tag=!79.Ready] at @s unless entity @p[gamemode=!spectator,distance=..7] run tp @s ^ ^ ^0.1 ~ ~ # プレイヤーがすごく近いかつ、後ろが床でなく、後ろが壁でもなければゆっくり後退 - execute if entity @s[tag=!79.Ready] at @s if entity @p[gamemode=!spectator,distance=..7] anchored eyes positioned ^ ^ ^ if block ^ ^ ^-1 #lib:no_collision if block ~ ~-0.25 ~ #lib:no_collision anchored feet at @s run tp @s ^ ^ ^-0.08 ~ ~ + execute if entity @s[tag=!79.Ready] at @s if entity @p[gamemode=!spectator,distance=..7] anchored eyes positioned ^ ^ ^ if block ^ ^ ^-1 #lib:no_collision/ if block ~ ~-0.25 ~ #lib:no_collision/ anchored feet at @s run tp @s ^ ^ ^-0.08 ~ ~ # 壁が後ろにあってこれ以上後退できない場合は発射準備に移る - execute if entity @s[tag=!79.Ready] at @s if entity @p[gamemode=!spectator,distance=..7] anchored eyes positioned ^ ^ ^ unless block ^ ^ ^-1 #lib:no_collision anchored feet at @s run tag @s add 79.Ready + execute if entity @s[tag=!79.Ready] at @s if entity @p[gamemode=!spectator,distance=..7] anchored eyes positioned ^ ^ ^ unless block ^ ^ ^-1 #lib:no_collision/ anchored feet at @s run tag @s add 79.Ready # Readyタグがあるときは発射準備 execute if entity @s[tag=79.Ready] run function asset:mob/0261.laser_eye_mk2/tick/ready diff --git a/Asset/data/asset/functions/mob/0261.laser_eye_mk2/tick/shoot_recursive.mcfunction b/Asset/data/asset/functions/mob/0261.laser_eye_mk2/tick/shoot_recursive.mcfunction index 4b31e1d89c2..58eabe64cf1 100644 --- a/Asset/data/asset/functions/mob/0261.laser_eye_mk2/tick/shoot_recursive.mcfunction +++ b/Asset/data/asset/functions/mob/0261.laser_eye_mk2/tick/shoot_recursive.mcfunction @@ -11,7 +11,7 @@ # 着弾検知 execute positioned ~-0.5 ~-0.5 ~-0.5 if entity @p[gamemode=!spectator,dx=0] run tag @s add Landing - execute unless block ^ ^ ^0.5 #lib:no_collision 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 @p[gamemode=!spectator,dx=0] run tag @p[gamemode=!spectator,dx=0,sort=random,limit=1] add LandingTarget diff --git a/Asset/data/asset/functions/mob/0263.shulker_bullet/detect_hit_block/.mcfunction b/Asset/data/asset/functions/mob/0263.shulker_bullet/detect_hit_block/.mcfunction index 93940b57daf..b72a4fc099f 100644 --- a/Asset/data/asset/functions/mob/0263.shulker_bullet/detect_hit_block/.mcfunction +++ b/Asset/data/asset/functions/mob/0263.shulker_bullet/detect_hit_block/.mcfunction @@ -5,4 +5,4 @@ # @within function asset:mob/alias/263/detect_hit_block # 判定 - execute unless block ~ ~ ~ #lib:no_collision run data modify storage asset:temp Projectile.IsHitBlock set value true + execute unless block ~ ~ ~ #lib:no_collision/ run data modify storage asset:temp Projectile.IsHitBlock set value true diff --git a/Asset/data/asset/functions/mob/0263.shulker_bullet/tick/target/.mcfunction b/Asset/data/asset/functions/mob/0263.shulker_bullet/tick/target/.mcfunction index 755fa297ca2..f927faaba98 100644 --- a/Asset/data/asset/functions/mob/0263.shulker_bullet/tick/target/.mcfunction +++ b/Asset/data/asset/functions/mob/0263.shulker_bullet/tick/target/.mcfunction @@ -13,4 +13,4 @@ # asset:mob/0263.shulker_bullet/tick/target/ execute if entity @s[dx=0] summon marker run return run function asset:mob/0263.shulker_bullet/tick/target/fetch -execute positioned ^ ^ ^0.2 if block ^ ^ ^ #lib:no_collision run return run function asset:mob/0263.shulker_bullet/tick/target/ +execute positioned ^ ^ ^0.2 if block ^ ^ ^ #lib:no_collision/ run return run function asset:mob/0263.shulker_bullet/tick/target/ diff --git a/Asset/data/asset/functions/mob/0264.dark_summoner/tick/casting.mcfunction b/Asset/data/asset/functions/mob/0264.dark_summoner/tick/casting.mcfunction index 00d93ee4c4e..9631eeaa8dd 100644 --- a/Asset/data/asset/functions/mob/0264.dark_summoner/tick/casting.mcfunction +++ b/Asset/data/asset/functions/mob/0264.dark_summoner/tick/casting.mcfunction @@ -23,9 +23,9 @@ execute if score @s 7C.Attack matches 100.. run particle minecraft:dust 0.545 0.5 0.655 2 ~ ~0.5 ~ 0.2 0.5 0.2 0 1 # 実行 - execute if score @s 7C.Attack matches 80 rotated ~ 0 positioned ^2 ^ ^ if block ~ ~ ~ #lib:no_collision run function asset:mob/0264.dark_summoner/tick/summon_minions - execute if score @s 7C.Attack matches 90 rotated ~ 0 positioned ^-2 ^ ^ if block ~ ~ ~ #lib:no_collision run function asset:mob/0264.dark_summoner/tick/summon_minions - execute if score @s 7C.Attack matches 85 rotated ~ 0 positioned ^ ^ ^-2 if block ~ ~ ~ #lib:no_collision run function asset:mob/0264.dark_summoner/tick/summon_minions + execute if score @s 7C.Attack matches 80 rotated ~ 0 positioned ^2 ^ ^ if block ~ ~ ~ #lib:no_collision/ run function asset:mob/0264.dark_summoner/tick/summon_minions + execute if score @s 7C.Attack matches 90 rotated ~ 0 positioned ^-2 ^ ^ if block ~ ~ ~ #lib:no_collision/ run function asset:mob/0264.dark_summoner/tick/summon_minions + execute if score @s 7C.Attack matches 85 rotated ~ 0 positioned ^ ^ ^-2 if block ~ ~ ~ #lib:no_collision/ run function asset:mob/0264.dark_summoner/tick/summon_minions # ポーズ変更 item replace entity @s[scores={7C.Attack=120}] armor.head with stick{CustomModelData:20214} diff --git a/Asset/data/asset/functions/mob/0264.dark_summoner/tick/teleport.mcfunction b/Asset/data/asset/functions/mob/0264.dark_summoner/tick/teleport.mcfunction index e95f4b64c29..1509d2c2ecb 100644 --- a/Asset/data/asset/functions/mob/0264.dark_summoner/tick/teleport.mcfunction +++ b/Asset/data/asset/functions/mob/0264.dark_summoner/tick/teleport.mcfunction @@ -23,7 +23,7 @@ execute as @e[type=marker,tag=SpreadMarker,distance=..0.01,sort=nearest,limit=1] at @s run function lib:spread_entity/ # マーカーの位置が安全ならワープする - execute at @e[type=marker,tag=SpreadMarker,distance=..10,sort=nearest,limit=1] if block ~ ~ ~ #lib:no_collision_without_fluid unless block ~ ~-1 ~ #lib:no_collision_without_fluid run tp @s ~ ~ ~ + execute at @e[type=marker,tag=SpreadMarker,distance=..10,sort=nearest,limit=1] if block ~ ~ ~ #lib:no_collision/without_fluid unless block ~ ~-1 ~ #lib:no_collision/without_fluid run tp @s ~ ~ ~ # マーカーをkill kill @e[type=marker,tag=SpreadMarker,distance=..10] diff --git a/Asset/data/asset/functions/mob/0265.dark_familiar/tick/.mcfunction b/Asset/data/asset/functions/mob/0265.dark_familiar/tick/.mcfunction index 6ce68ae6080..2ab3ef59db6 100644 --- a/Asset/data/asset/functions/mob/0265.dark_familiar/tick/.mcfunction +++ b/Asset/data/asset/functions/mob/0265.dark_familiar/tick/.mcfunction @@ -19,12 +19,12 @@ execute unless entity @e[type=zombie,scores={MobID=264},distance=..30] facing entity @p[distance=..30] feet positioned ^ ^ ^-100 rotated as @s positioned ^ ^ ^-2000 facing entity @s eyes positioned as @s run tp @s ^ ^ ^0.2 ~ ~ # 接地で上を向く - execute positioned ~ ~1.68 ~ unless block ~ ~-1 ~ #lib:no_collision at @s run tp @s ~ ~ ~ ~ ~-35 - execute positioned ~ ~1.68 ~ unless block ~ ~1 ~ #lib:no_collision at @s run tp @s ~ ~ ~ ~ ~80 + execute positioned ~ ~1.68 ~ unless block ~ ~-1 ~ #lib:no_collision/ at @s run tp @s ~ ~ ~ ~ ~-35 + execute positioned ~ ~1.68 ~ unless block ~ ~1 ~ #lib:no_collision/ at @s run tp @s ~ ~ ~ ~ ~80 # カベにぶつかった際の処理 - execute positioned ~ ~1.68 ~ unless block ^ ^ ^0.5 #lib:no_collision at @s run tp @s ~ ~ ~ ~45 ~-45 - execute positioned ~ ~1.68 ~ unless block ^ ^ ^0.2 #lib:no_collision at @s run tp @s ~ ~ ~ ~45 ~-45 + execute positioned ~ ~1.68 ~ unless block ^ ^ ^0.5 #lib:no_collision/ at @s run tp @s ~ ~ ~ ~45 ~-45 + execute positioned ~ ~1.68 ~ unless block ^ ^ ^0.2 #lib:no_collision/ at @s run tp @s ~ ~ ~ ~45 ~-45 # スコア scoreboard players add @s General.Mob.Tick 1 diff --git a/Asset/data/asset/functions/mob/0273.hell_blade/landing.mcfunction b/Asset/data/asset/functions/mob/0273.hell_blade/landing.mcfunction index 9a4416c9cb0..e65e4ccf5f6 100644 --- a/Asset/data/asset/functions/mob/0273.hell_blade/landing.mcfunction +++ b/Asset/data/asset/functions/mob/0273.hell_blade/landing.mcfunction @@ -5,8 +5,8 @@ # @within function asset:mob/0273.hell_blade/fall # フルブロック未満のと着地したらブロックのど真ん中に補正する - execute unless block ~ ~ ~ #lib:no_collision align xyz positioned ~0.5 ~1 ~0.5 rotated ~ 0 run tp @s ^ ^ ^-0.125 ~ ~ - execute if block ~ ~ ~ #lib:no_collision align xyz positioned ~0.5 ~ ~0.5 rotated ~ 0 run tp @s ^ ^ ^-0.125 ~ ~ + execute unless block ~ ~ ~ #lib:no_collision/ align xyz positioned ~0.5 ~1 ~0.5 rotated ~ 0 run tp @s ^ ^ ^-0.125 ~ ~ + execute if block ~ ~ ~ #lib:no_collision/ align xyz positioned ~0.5 ~ ~0.5 rotated ~ 0 run tp @s ^ ^ ^-0.125 ~ ~ # NoAIをつける data modify entity @s NoAI set value 1b diff --git a/Asset/data/asset/functions/mob/0274.death_saw_jiki/tick/.mcfunction b/Asset/data/asset/functions/mob/0274.death_saw_jiki/tick/.mcfunction index 9356dfaba89..2caedddc33e 100644 --- a/Asset/data/asset/functions/mob/0274.death_saw_jiki/tick/.mcfunction +++ b/Asset/data/asset/functions/mob/0274.death_saw_jiki/tick/.mcfunction @@ -5,14 +5,14 @@ # @within function asset:mob/alias/274/tick # 足元が空気なら少し落下 - execute if block ~ ~-0.5 ~ #lib:no_collision run tp @s ~ ~-0.5 ~ + execute if block ~ ~-0.5 ~ #lib:no_collision/ run tp @s ~ ~-0.5 ~ # 前方が階段状なら上にTPする - execute unless block ^ ^ ^1 #lib:no_collision if block ^ ^1 ^1 #lib:no_collision at @s run tp ~ ~1 ~ + execute unless block ^ ^ ^1 #lib:no_collision/ if block ^ ^1 ^1 #lib:no_collision/ at @s run tp ~ ~1 ~ # 前方が壁なら方向転換 - execute unless block ^ ^ ^1 #lib:no_collision unless block ^ ^1 ^1 #lib:no_collision at @s run tp @s ~ ~ ~ ~45 ~ + execute unless block ^ ^ ^1 #lib:no_collision/ unless block ^ ^1 ^1 #lib:no_collision/ at @s run tp @s ~ ~ ~ ~45 ~ # 前方が2m穴なら適当に方向転換 - execute unless block ~ ~-1 ~ #lib:no_collision if block ^ ^ ^1 #lib:no_collision if block ^ ^-1 ^1 #lib:no_collision if block ^ ^-2 ^1 #lib:no_collision at @s run tp @s ~ ~ ~ ~45 ~ + execute unless block ~ ~-1 ~ #lib:no_collision/ if block ^ ^ ^1 #lib:no_collision/ if block ^ ^-1 ^1 #lib:no_collision/ if block ^ ^-2 ^1 #lib:no_collision/ at @s run tp @s ~ ~ ~ ~45 ~ # プレイヤーが近くにいないなら前進する execute unless entity @a[distance=..10] at @s rotated ~ 0 run tp ^ ^ ^0.2 diff --git a/Asset/data/asset/functions/mob/0301.karmic/tick/common/shot/loop.mcfunction b/Asset/data/asset/functions/mob/0301.karmic/tick/common/shot/loop.mcfunction index 718161edf04..0eb31a14f15 100644 --- a/Asset/data/asset/functions/mob/0301.karmic/tick/common/shot/loop.mcfunction +++ b/Asset/data/asset/functions/mob/0301.karmic/tick/common/shot/loop.mcfunction @@ -8,7 +8,7 @@ # 着弾検知 execute if entity @a[gamemode=!spectator,distance=..2] run tag @s add Landing - execute unless block ^ ^ ^0.5 #lib:no_collision run tag @s add Landing + execute unless block ^ ^ ^0.5 #lib:no_collision/ run tag @s add Landing # ターゲットにタグ付与 execute if entity @a[gamemode=!spectator,distance=..2] run tag @p[gamemode=!spectator,distance=..2] add LandingTarget diff --git a/Asset/data/asset/functions/mob/0301.karmic/tick/common/shot_strong/loop.mcfunction b/Asset/data/asset/functions/mob/0301.karmic/tick/common/shot_strong/loop.mcfunction index 17f66436b5a..5401a42a321 100644 --- a/Asset/data/asset/functions/mob/0301.karmic/tick/common/shot_strong/loop.mcfunction +++ b/Asset/data/asset/functions/mob/0301.karmic/tick/common/shot_strong/loop.mcfunction @@ -8,7 +8,7 @@ # 着弾検知 execute if entity @a[gamemode=!spectator,distance=..2] run tag @s add Landing - execute unless block ^ ^ ^0.5 #lib:no_collision run tag @s add Landing + execute unless block ^ ^ ^0.5 #lib:no_collision/ run tag @s add Landing # ターゲットにタグ付与 execute if entity @a[gamemode=!spectator,distance=..2] run tag @p[gamemode=!spectator,distance=..2] add LandingTarget diff --git a/Asset/data/asset/functions/mob/0301.karmic/tick/common/teleport_check/block_check.mcfunction b/Asset/data/asset/functions/mob/0301.karmic/tick/common/teleport_check/block_check.mcfunction index 83293711ec1..d7bc7ec49b9 100644 --- a/Asset/data/asset/functions/mob/0301.karmic/tick/common/teleport_check/block_check.mcfunction +++ b/Asset/data/asset/functions/mob/0301.karmic/tick/common/teleport_check/block_check.mcfunction @@ -7,4 +7,4 @@ # asset:mob/0301.karmic/tick/common/teleport_check/block_check execute positioned ~-0.5 ~-0.5 ~-0.5 if entity @p[dx=0,dy=0,dz=0] run tag @s add TeleportCheck -execute unless entity @s[tag=TeleportCheck] positioned ^ ^ ^0.15 if entity @s[distance=..15] if block ~ ~ ~ #lib:no_collision run function asset:mob/0301.karmic/tick/common/teleport_check/block_check +execute unless entity @s[tag=TeleportCheck] positioned ^ ^ ^0.15 if entity @s[distance=..15] if block ~ ~ ~ #lib:no_collision/ run function asset:mob/0301.karmic/tick/common/teleport_check/block_check diff --git a/Asset/data/asset/functions/mob/0301.karmic/tick/common/tp.mcfunction b/Asset/data/asset/functions/mob/0301.karmic/tick/common/tp.mcfunction index 3f0f928acaf..ed28e3b2162 100644 --- a/Asset/data/asset/functions/mob/0301.karmic/tick/common/tp.mcfunction +++ b/Asset/data/asset/functions/mob/0301.karmic/tick/common/tp.mcfunction @@ -5,6 +5,6 @@ # @within function asset:mob/0301.karmic/tick/** # 自身をその場所まで持っていく(雑床埋まり対策もする) - execute if block ~ ~ ~ #lib:no_collision run tp @s ~ ~ ~ ~ ~ - execute unless block ~ ~ ~ #lib:no_collision run tp @s ~ ~0.1 ~ ~ ~ + execute if block ~ ~ ~ #lib:no_collision/ run tp @s ~ ~ ~ ~ ~ + execute unless block ~ ~ ~ #lib:no_collision/ run tp @s ~ ~0.1 ~ ~ ~ execute at @s rotated ~ 0 run tp @e[type=item_display,tag=8D.AJ,tag=8D.AJLink,distance=..100,sort=nearest,limit=1] ~ ~ ~ ~ ~ diff --git a/Asset/data/asset/functions/mob/0301.karmic/tick/fall/main.mcfunction b/Asset/data/asset/functions/mob/0301.karmic/tick/fall/main.mcfunction index 5d900dd01c1..117f41d2d60 100644 --- a/Asset/data/asset/functions/mob/0301.karmic/tick/fall/main.mcfunction +++ b/Asset/data/asset/functions/mob/0301.karmic/tick/fall/main.mcfunction @@ -14,7 +14,7 @@ execute if score @s General.Mob.Tick matches 4.. at @s positioned ~ ~-0.1 ~ run function asset:mob/0301.karmic/tick/common/tp # 地面についたらリセット - execute if score @s General.Mob.Tick matches 0.. at @s unless block ~ ~-0.1 ~ #lib:no_collision run function asset:mob/0301.karmic/tick/skill_reset + execute if score @s General.Mob.Tick matches 0.. at @s unless block ~ ~-0.1 ~ #lib:no_collision/ run function asset:mob/0301.karmic/tick/skill_reset # 地面につかない異常事態？プレイヤーにTPしてリセット execute if score @s General.Mob.Tick matches 100 at @p[gamemode=!spectator,distance=..100] run function asset:mob/0301.karmic/tick/common/tp execute if score @s General.Mob.Tick matches 100 run function asset:mob/0301.karmic/tick/skill_reset diff --git a/Asset/data/asset/functions/mob/0301.karmic/tick/skill_reset.mcfunction b/Asset/data/asset/functions/mob/0301.karmic/tick/skill_reset.mcfunction index 2969c7a6321..8249aaa376a 100644 --- a/Asset/data/asset/functions/mob/0301.karmic/tick/skill_reset.mcfunction +++ b/Asset/data/asset/functions/mob/0301.karmic/tick/skill_reset.mcfunction @@ -46,5 +46,5 @@ tag @s remove 8D.SkipSkillSelect # 地面に着いていない時、落下スキルを発動 - execute if block ~ ~-0.5 ~ #lib:no_collision run scoreboard players set @s General.Mob.Tick 0 - execute if block ~ ~-0.5 ~ #lib:no_collision run tag @s add 8D.Fall + execute if block ~ ~-0.5 ~ #lib:no_collision/ run scoreboard players set @s General.Mob.Tick 0 + execute if block ~ ~-0.5 ~ #lib:no_collision/ run tag @s add 8D.Fall diff --git a/Asset/data/asset/functions/mob/0311.blazing_inferno/tick/skill/dash_punch/tick.mcfunction b/Asset/data/asset/functions/mob/0311.blazing_inferno/tick/skill/dash_punch/tick.mcfunction index 6b24436c135..f8d509c5be7 100644 --- a/Asset/data/asset/functions/mob/0311.blazing_inferno/tick/skill/dash_punch/tick.mcfunction +++ b/Asset/data/asset/functions/mob/0311.blazing_inferno/tick/skill/dash_punch/tick.mcfunction @@ -14,8 +14,8 @@ execute if score @s General.Mob.Tick matches 20..40 run function asset:mob/0311.blazing_inferno/tick/skill/dash_punch/move_stacked # ブロックに触れたら強制停止 - execute if score @s General.Mob.Tick matches 20..40 at @s unless block ^ ^ ^1 #lib:no_collision run scoreboard players set @s General.Mob.Tick 40 - execute if score @s General.Mob.Tick matches 20..40 at @s unless block ^ ^ ^2 #lib:no_collision run scoreboard players set @s General.Mob.Tick 40 + execute if score @s General.Mob.Tick matches 20..40 at @s unless block ^ ^ ^1 #lib:no_collision/ run scoreboard players set @s General.Mob.Tick 40 + execute if score @s General.Mob.Tick matches 20..40 at @s unless block ^ ^ ^2 #lib:no_collision/ run scoreboard players set @s General.Mob.Tick 40 # 眼の前にプレイヤーがいてもやめる execute if score @s General.Mob.Tick matches 20..40 at @s positioned ~ ~1.5 ~ positioned ^ ^ ^-3 if entity @a[distance=..2] run scoreboard players set @s General.Mob.Tick 40 diff --git a/Asset/data/asset/functions/mob/0311.blazing_inferno/tick/skill/ground_slam/falling/alert/recursive.mcfunction b/Asset/data/asset/functions/mob/0311.blazing_inferno/tick/skill/ground_slam/falling/alert/recursive.mcfunction index 5983eca8a27..d7526c981b5 100644 --- a/Asset/data/asset/functions/mob/0311.blazing_inferno/tick/skill/ground_slam/falling/alert/recursive.mcfunction +++ b/Asset/data/asset/functions/mob/0311.blazing_inferno/tick/skill/ground_slam/falling/alert/recursive.mcfunction @@ -7,7 +7,7 @@ # asset:mob/0311.blazing_inferno/tick/skill/ground_slam/falling/alert/recursive # 現在の実行座標の下に判定がなかったら - execute unless block ~ ~-1 ~ #lib:no_collision positioned ~ ~ ~ run function asset:mob/0311.blazing_inferno/tick/skill/ground_slam/falling/alert/summon + execute unless block ~ ~-1 ~ #lib:no_collision/ positioned ~ ~ ~ run function asset:mob/0311.blazing_inferno/tick/skill/ground_slam/falling/alert/summon # 地面まで降りる - execute if entity @s[distance=..16] positioned ~ ~-1 ~ if block ~ ~ ~ #lib:no_collision run function asset:mob/0311.blazing_inferno/tick/skill/ground_slam/falling/alert/recursive + execute if entity @s[distance=..16] positioned ~ ~-1 ~ if block ~ ~ ~ #lib:no_collision/ run function asset:mob/0311.blazing_inferno/tick/skill/ground_slam/falling/alert/recursive diff --git a/Asset/data/asset/functions/mob/0321.mini_guardian/tick/.mcfunction b/Asset/data/asset/functions/mob/0321.mini_guardian/tick/.mcfunction index 606704a63d3..70f29334e31 100644 --- a/Asset/data/asset/functions/mob/0321.mini_guardian/tick/.mcfunction +++ b/Asset/data/asset/functions/mob/0321.mini_guardian/tick/.mcfunction @@ -23,9 +23,9 @@ data modify entity @s[scores={8X.HurtTime=..0}] NoAI set value 1b # 接地で上を向く - execute positioned ~ ~1.5 ~ unless block ~ ~-1 ~ #lib:no_collision at @s run tp @s ~ ~ ~ ~ ~-35 - execute positioned ~ ~1.5 ~ unless block ~ ~1 ~ #lib:no_collision at @s run tp @s ~ ~ ~ ~ ~80 + execute positioned ~ ~1.5 ~ unless block ~ ~-1 ~ #lib:no_collision/ at @s run tp @s ~ ~ ~ ~ ~-35 + execute positioned ~ ~1.5 ~ unless block ~ ~1 ~ #lib:no_collision/ at @s run tp @s ~ ~ ~ ~ ~80 # カベにぶつかった際の処理 - execute positioned ~ ~1.5 ~ unless block ^ ^ ^1 #lib:no_collision at @s run tp @s ~ ~ ~ ~45 ~-45 - execute positioned ~ ~1.5 ~ unless block ^ ^ ^0.4 #lib:no_collision at @s run tp @s ~ ~ ~ ~45 ~-45 + execute positioned ~ ~1.5 ~ unless block ^ ^ ^1 #lib:no_collision/ at @s run tp @s ~ ~ ~ ~45 ~-45 + execute positioned ~ ~1.5 ~ unless block ^ ^ ^0.4 #lib:no_collision/ at @s run tp @s ~ ~ ~ ~45 ~-45 diff --git a/Asset/data/asset/functions/mob/0321.mini_guardian/tick/event/laser/green.mcfunction b/Asset/data/asset/functions/mob/0321.mini_guardian/tick/event/laser/green.mcfunction index eb5c4e0de1f..df8469a769e 100644 --- a/Asset/data/asset/functions/mob/0321.mini_guardian/tick/event/laser/green.mcfunction +++ b/Asset/data/asset/functions/mob/0321.mini_guardian/tick/event/laser/green.mcfunction @@ -22,4 +22,4 @@ scoreboard players reset $DamageInterval Temporary # 壁がなかったり、プレイヤーにあたったりしなければ再帰 - execute if entity @s[distance=..15] positioned ~-0.5 ~-0.5 ~-0.5 unless entity @p[gamemode=!spectator,dx=0] positioned ~0.5 ~0.5 ~0.5 positioned ^ ^ ^1 if block ~ ~ ~ #lib:no_collision run function asset:mob/0321.mini_guardian/tick/event/laser/green + execute if entity @s[distance=..15] positioned ~-0.5 ~-0.5 ~-0.5 unless entity @p[gamemode=!spectator,dx=0] positioned ~0.5 ~0.5 ~0.5 positioned ^ ^ ^1 if block ~ ~ ~ #lib:no_collision/ run function asset:mob/0321.mini_guardian/tick/event/laser/green diff --git a/Asset/data/asset/functions/mob/0321.mini_guardian/tick/event/laser/yellow.mcfunction b/Asset/data/asset/functions/mob/0321.mini_guardian/tick/event/laser/yellow.mcfunction index bfab09c2219..ee7f85a10f1 100644 --- a/Asset/data/asset/functions/mob/0321.mini_guardian/tick/event/laser/yellow.mcfunction +++ b/Asset/data/asset/functions/mob/0321.mini_guardian/tick/event/laser/yellow.mcfunction @@ -14,4 +14,4 @@ particle dust 1 1 0 0.4 ^ ^ ^-0.25 0 0 0 0 1 force @a[distance=..30] # 壁がなかったり、プレイヤーにあたったりしなければ再帰 - execute if entity @s[distance=..15] positioned ~-0.5 ~-0.5 ~-0.5 unless entity @p[gamemode=!spectator,dx=0] positioned ~0.5 ~0.5 ~0.5 positioned ^ ^ ^1 if block ~ ~ ~ #lib:no_collision run function asset:mob/0321.mini_guardian/tick/event/laser/yellow + execute if entity @s[distance=..15] positioned ~-0.5 ~-0.5 ~-0.5 unless entity @p[gamemode=!spectator,dx=0] positioned ~0.5 ~0.5 ~0.5 positioned ^ ^ ^1 if block ~ ~ ~ #lib:no_collision/ run function asset:mob/0321.mini_guardian/tick/event/laser/yellow diff --git a/Asset/data/asset/functions/mob/0327.eclael/tick/app.general/15.update_altitude.mcfunction b/Asset/data/asset/functions/mob/0327.eclael/tick/app.general/15.update_altitude.mcfunction index 8ebcdb32714..3e041d6c93e 100644 --- a/Asset/data/asset/functions/mob/0327.eclael/tick/app.general/15.update_altitude.mcfunction +++ b/Asset/data/asset/functions/mob/0327.eclael/tick/app.general/15.update_altitude.mcfunction @@ -5,4 +5,4 @@ # @within asset:mob/0327.eclael/tick/** # プレイヤー方面に移動 - execute at @s facing entity @a[tag=!PlayerShouldInvulnerable,distance=..80,sort=nearest,limit=1] feet positioned ^ ^ ^1 rotated ~ 0 positioned ^ ^ ^-1 rotated as @s if block ~ ~-0.1 ~ #lib:no_collision run function asset:mob/0327.eclael/tick/app.general/2.teleport + execute at @s facing entity @a[tag=!PlayerShouldInvulnerable,distance=..80,sort=nearest,limit=1] feet positioned ^ ^ ^1 rotated ~ 0 positioned ^ ^ ^-1 rotated as @s if block ~ ~-0.1 ~ #lib:no_collision/ run function asset:mob/0327.eclael/tick/app.general/2.teleport diff --git a/Asset/data/asset/functions/mob/0327.eclael/tick/app.general/2.teleport.mcfunction b/Asset/data/asset/functions/mob/0327.eclael/tick/app.general/2.teleport.mcfunction index 56b88dde922..2ff0b2c8ab3 100644 --- a/Asset/data/asset/functions/mob/0327.eclael/tick/app.general/2.teleport.mcfunction +++ b/Asset/data/asset/functions/mob/0327.eclael/tick/app.general/2.teleport.mcfunction @@ -5,4 +5,4 @@ # @within asset:mob/0327.eclael/** # 壁の中ではない場合のみ移動 - execute if block ~ ~ ~ #lib:no_collision run tp @s ~ ~ ~ ~ ~ + execute if block ~ ~ ~ #lib:no_collision/ run tp @s ~ ~ ~ ~ ~ diff --git a/Asset/data/asset/functions/mob/0327.eclael/tick/app.general/move_to_ground_loop.mcfunction b/Asset/data/asset/functions/mob/0327.eclael/tick/app.general/move_to_ground_loop.mcfunction index 3162c274e4a..0c45ccac841 100644 --- a/Asset/data/asset/functions/mob/0327.eclael/tick/app.general/move_to_ground_loop.mcfunction +++ b/Asset/data/asset/functions/mob/0327.eclael/tick/app.general/move_to_ground_loop.mcfunction @@ -7,5 +7,5 @@ # 接地するまで繰り返す scoreboard players remove @s 93.TempCount 1 - execute if score @s 93.TempCount matches 1.. if block ~ ~-1 ~ #lib:no_collision positioned ~ ~-1 ~ run function asset:mob/0327.eclael/tick/app.general/move_to_ground_loop - execute unless block ~ ~-1 ~ #lib:no_collision run tp @s ~ ~ ~ + execute if score @s 93.TempCount matches 1.. if block ~ ~-1 ~ #lib:no_collision/ positioned ~ ~-1 ~ run function asset:mob/0327.eclael/tick/app.general/move_to_ground_loop + execute unless block ~ ~-1 ~ #lib:no_collision/ run tp @s ~ ~ ~ diff --git a/Asset/data/asset/functions/mob/0327.eclael/tick/app.skill_events/32_latter_fall/attack_check.mcfunction b/Asset/data/asset/functions/mob/0327.eclael/tick/app.skill_events/32_latter_fall/attack_check.mcfunction index f6c6b9f5572..bdd01572c9e 100644 --- a/Asset/data/asset/functions/mob/0327.eclael/tick/app.skill_events/32_latter_fall/attack_check.mcfunction +++ b/Asset/data/asset/functions/mob/0327.eclael/tick/app.skill_events/32_latter_fall/attack_check.mcfunction @@ -5,7 +5,7 @@ # @within function asset:mob/0327.eclael/tick/app.skill_events/32_latter_fall/main # 地面が無い場合、攻撃しない - execute if block ~ ~-1 ~ #lib:no_collision run return run kill @s + execute if block ~ ~-1 ~ #lib:no_collision/ run return run kill @s # 攻撃 function asset:mob/0327.eclael/tick/app.skill_events/32_latter_fall/attack_thunder diff --git a/Asset/data/asset/functions/mob/0330.aurora_reaper/tick/.mcfunction b/Asset/data/asset/functions/mob/0330.aurora_reaper/tick/.mcfunction index b5fa0d2a37b..6f8def77c84 100644 --- a/Asset/data/asset/functions/mob/0330.aurora_reaper/tick/.mcfunction +++ b/Asset/data/asset/functions/mob/0330.aurora_reaper/tick/.mcfunction @@ -11,5 +11,5 @@ execute store result storage asset:context this.MotionCT int 0.9999999999 run data get storage asset:context this.MotionCT # motionCTが0かつ、周囲64mにプレイヤーがいるかつ、空中ならプレイヤーの方へmotionする - # execute if data storage asset:context this{MotionCT:0} unless data storage asset:context this{AirJumpCount:0} if block ~ ~-1 ~ #lib:no_collision_without_fluid if block ~ ~-2 ~ #lib:no_collision_without_fluid if block ~ ~-3 ~ #lib:no_collision_without_fluid run function asset:mob/0330.aurora_reaper/tick/air_jump - execute if data storage asset:context this{MotionCT:0} if entity @p[gamemode=!spectator,distance=..64] if block ~ ~-1 ~ #lib:no_collision_without_fluid if block ~ ~-2 ~ #lib:no_collision_without_fluid if block ~ ~-3 ~ #lib:no_collision_without_fluid run function asset:mob/0330.aurora_reaper/tick/air_jump + # execute if data storage asset:context this{MotionCT:0} unless data storage asset:context this{AirJumpCount:0} if block ~ ~-1 ~ #lib:no_collision/without_fluid if block ~ ~-2 ~ #lib:no_collision/without_fluid if block ~ ~-3 ~ #lib:no_collision/without_fluid run function asset:mob/0330.aurora_reaper/tick/air_jump + execute if data storage asset:context this{MotionCT:0} if entity @p[gamemode=!spectator,distance=..64] if block ~ ~-1 ~ #lib:no_collision/without_fluid if block ~ ~-2 ~ #lib:no_collision/without_fluid if block ~ ~-3 ~ #lib:no_collision/without_fluid run function asset:mob/0330.aurora_reaper/tick/air_jump diff --git a/Asset/data/asset/functions/mob/0331.aurora_sorcerer/tick/backstep/check.mcfunction b/Asset/data/asset/functions/mob/0331.aurora_sorcerer/tick/backstep/check.mcfunction index c2d95a30a42..05f55322c79 100644 --- a/Asset/data/asset/functions/mob/0331.aurora_sorcerer/tick/backstep/check.mcfunction +++ b/Asset/data/asset/functions/mob/0331.aurora_sorcerer/tick/backstep/check.mcfunction @@ -8,7 +8,7 @@ execute if entity @s[scores={97.MotionCT=1..}] run return fail # 浮いてたら失敗 - execute if block ~ ~-0.1 ~ #lib:no_collision_without_fluid run return fail + execute if block ~ ~-0.1 ~ #lib:no_collision/without_fluid run return fail # 周囲にプレイヤーがいない execute unless entity @p[gamemode=!spectator,distance=..5] run return fail diff --git a/Asset/data/asset/functions/mob/0331.aurora_sorcerer/tick/make_scaffold/check.mcfunction b/Asset/data/asset/functions/mob/0331.aurora_sorcerer/tick/make_scaffold/check.mcfunction index e28ac6ae18a..e973c7ad808 100644 --- a/Asset/data/asset/functions/mob/0331.aurora_sorcerer/tick/make_scaffold/check.mcfunction +++ b/Asset/data/asset/functions/mob/0331.aurora_sorcerer/tick/make_scaffold/check.mcfunction @@ -14,9 +14,9 @@ execute unless data storage asset:context this{CannotMakeScaffoldTick:0} run return fail # 自身が空中にいるか - execute unless block ~ ~-1 ~ #lib:no_collision_without_fluid run return fail - execute unless block ~ ~-2 ~ #lib:no_collision_without_fluid run return fail - execute unless block ~ ~-3 ~ #lib:no_collision_without_fluid run return fail + execute unless block ~ ~-1 ~ #lib:no_collision/without_fluid run return fail + execute unless block ~ ~-2 ~ #lib:no_collision/without_fluid run return fail + execute unless block ~ ~-3 ~ #lib:no_collision/without_fluid run return fail # 成功 return 1 diff --git a/Asset/data/asset/functions/mob/0339.twins_sapphiel/app/general/3.teleport.mcfunction b/Asset/data/asset/functions/mob/0339.twins_sapphiel/app/general/3.teleport.mcfunction index 144a66aa5ed..7f8a8ef4084 100644 --- a/Asset/data/asset/functions/mob/0339.twins_sapphiel/app/general/3.teleport.mcfunction +++ b/Asset/data/asset/functions/mob/0339.twins_sapphiel/app/general/3.teleport.mcfunction @@ -5,4 +5,4 @@ # @within asset:mob/0339.twins_sapphiel/tick/** # 壁の中ではない場合のみ移動 - execute if block ~ ~ ~ #lib:no_collision run tp @s ~ ~ ~ ~ ~ + execute if block ~ ~ ~ #lib:no_collision/ run tp @s ~ ~ ~ ~ ~ diff --git a/Asset/data/asset/functions/mob/0339.twins_sapphiel/app/general/6.teleport_to_land.mcfunction b/Asset/data/asset/functions/mob/0339.twins_sapphiel/app/general/6.teleport_to_land.mcfunction index e4f28abf531..ed6bdeb532d 100644 --- a/Asset/data/asset/functions/mob/0339.twins_sapphiel/app/general/6.teleport_to_land.mcfunction +++ b/Asset/data/asset/functions/mob/0339.twins_sapphiel/app/general/6.teleport_to_land.mcfunction @@ -7,5 +7,5 @@ # function asset:mob/0339.twins_sapphiel/app/general/6.teleport_to_land # 壁に埋まるまで下に移動する - execute if block ~ ~-0.5 ~ #lib:no_collision run tp @s ~ ~-0.4 ~ - execute if block ~ ~-0.5 ~ #lib:no_collision positioned ~ ~-0.5 ~ run function asset:mob/0339.twins_sapphiel/app/general/6.teleport_to_land + execute if block ~ ~-0.5 ~ #lib:no_collision/ run tp @s ~ ~-0.4 ~ + execute if block ~ ~-0.5 ~ #lib:no_collision/ positioned ~ ~-0.5 ~ run function asset:mob/0339.twins_sapphiel/app/general/6.teleport_to_land diff --git a/Asset/data/asset/functions/mob/0339.twins_sapphiel/tick/app/skill/event_handler/06_1_hg_lowkick/5.damage.mcfunction b/Asset/data/asset/functions/mob/0339.twins_sapphiel/tick/app/skill/event_handler/06_1_hg_lowkick/5.damage.mcfunction index b1d733c85ed..dd42ce0c9b1 100644 --- a/Asset/data/asset/functions/mob/0339.twins_sapphiel/tick/app/skill/event_handler/06_1_hg_lowkick/5.damage.mcfunction +++ b/Asset/data/asset/functions/mob/0339.twins_sapphiel/tick/app/skill/event_handler/06_1_hg_lowkick/5.damage.mcfunction @@ -7,7 +7,7 @@ # ヒット判定 tag @a[tag=!PlayerShouldInvulnerable,distance=..2.8] add 9F.Temp.Target.Attack - execute as @a[tag=9F.Temp.Target.Attack] at @s if block ~ ~-1 ~ #lib:no_collision run tag @s remove 9F.Temp.Target.Attack + execute as @a[tag=9F.Temp.Target.Attack] at @s if block ~ ~-1 ~ #lib:no_collision/ run tag @s remove 9F.Temp.Target.Attack # TODO:ダメージ data modify storage api: Argument.Damage set from storage asset:context this.Damage.LowKick diff --git a/Asset/data/asset/functions/mob/0339.twins_sapphiel/tick/app/skill/event_handler/41_cover/5.3.damage_low.mcfunction b/Asset/data/asset/functions/mob/0339.twins_sapphiel/tick/app/skill/event_handler/41_cover/5.3.damage_low.mcfunction index c9003ee6f0a..9ebcd7bece2 100644 --- a/Asset/data/asset/functions/mob/0339.twins_sapphiel/tick/app/skill/event_handler/41_cover/5.3.damage_low.mcfunction +++ b/Asset/data/asset/functions/mob/0339.twins_sapphiel/tick/app/skill/event_handler/41_cover/5.3.damage_low.mcfunction @@ -7,7 +7,7 @@ # ヒット判定 tag @a[distance=..2.8] add 9F.Temp.Target.Attack - execute as @a[tag=9F.Temp.Target.Attack] at @s if block ~ ~-1 ~ #lib:no_collision run tag @s remove 9F.Temp.Target.Attack + execute as @a[tag=9F.Temp.Target.Attack] at @s if block ~ ~-1 ~ #lib:no_collision/ run tag @s remove 9F.Temp.Target.Attack # TODO:ダメージ data modify storage api: Argument.Damage set from storage asset:context this.Damage.CoverLow diff --git a/Asset/data/asset/functions/mob/0340.twins_rubiel/app/general/3.teleport.mcfunction b/Asset/data/asset/functions/mob/0340.twins_rubiel/app/general/3.teleport.mcfunction index be11a03d8e4..8e0dbbac699 100644 --- a/Asset/data/asset/functions/mob/0340.twins_rubiel/app/general/3.teleport.mcfunction +++ b/Asset/data/asset/functions/mob/0340.twins_rubiel/app/general/3.teleport.mcfunction @@ -5,4 +5,4 @@ # @within asset:mob/0340.twins_rubiel/** # 壁の中ではない場合のみ移動 - execute if block ~ ~ ~ #lib:no_collision run tp @s ~ ~ ~ ~ ~ + execute if block ~ ~ ~ #lib:no_collision/ run tp @s ~ ~ ~ ~ ~ diff --git a/Asset/data/asset/functions/mob/0340.twins_rubiel/app/general/6.teleport_to_land.mcfunction b/Asset/data/asset/functions/mob/0340.twins_rubiel/app/general/6.teleport_to_land.mcfunction index ec8ed14662b..00bd21415e8 100644 --- a/Asset/data/asset/functions/mob/0340.twins_rubiel/app/general/6.teleport_to_land.mcfunction +++ b/Asset/data/asset/functions/mob/0340.twins_rubiel/app/general/6.teleport_to_land.mcfunction @@ -7,5 +7,5 @@ # function asset:mob/0340.twins_rubiel/app/general/6.teleport_to_land # 壁に埋まるまで下に移動する - execute if block ~ ~-0.5 ~ #lib:no_collision run tp @s ~ ~-0.4 ~ - execute if block ~ ~-0.5 ~ #lib:no_collision positioned ~ ~-0.5 ~ run function asset:mob/0340.twins_rubiel/app/general/6.teleport_to_land + execute if block ~ ~-0.5 ~ #lib:no_collision/ run tp @s ~ ~-0.4 ~ + execute if block ~ ~-0.5 ~ #lib:no_collision/ positioned ~ ~-0.5 ~ run function asset:mob/0340.twins_rubiel/app/general/6.teleport_to_land diff --git a/Asset/data/asset/functions/mob/0340.twins_rubiel/app/general/7.update_altitude_to_player.mcfunction b/Asset/data/asset/functions/mob/0340.twins_rubiel/app/general/7.update_altitude_to_player.mcfunction index c493c397a81..4efc7dc69a4 100644 --- a/Asset/data/asset/functions/mob/0340.twins_rubiel/app/general/7.update_altitude_to_player.mcfunction +++ b/Asset/data/asset/functions/mob/0340.twins_rubiel/app/general/7.update_altitude_to_player.mcfunction @@ -5,4 +5,4 @@ # @within asset:mob/0340.twins_rubiel/tick/** # プレイヤー方面に移動 - execute at @s facing entity @a[tag=!PlayerShouldInvulnerable,sort=nearest,limit=1] feet positioned ^ ^ ^1 rotated ~ 0 positioned ^ ^ ^-1 rotated as @s if block ~ ~-0.1 ~ #lib:no_collision run function asset:mob/0340.twins_rubiel/app/general/3.teleport + execute at @s facing entity @a[tag=!PlayerShouldInvulnerable,sort=nearest,limit=1] feet positioned ^ ^ ^1 rotated ~ 0 positioned ^ ^ ^-1 rotated as @s if block ~ ~-0.1 ~ #lib:no_collision/ run function asset:mob/0340.twins_rubiel/app/general/3.teleport diff --git a/Asset/data/asset/functions/mob/0340.twins_rubiel/tick/app/skill/event_handler/03_2_kt_movetospear/5.damage.mcfunction b/Asset/data/asset/functions/mob/0340.twins_rubiel/tick/app/skill/event_handler/03_2_kt_movetospear/5.damage.mcfunction index 933e8dca0f6..58efb6a36eb 100644 --- a/Asset/data/asset/functions/mob/0340.twins_rubiel/tick/app/skill/event_handler/03_2_kt_movetospear/5.damage.mcfunction +++ b/Asset/data/asset/functions/mob/0340.twins_rubiel/tick/app/skill/event_handler/03_2_kt_movetospear/5.damage.mcfunction @@ -8,7 +8,7 @@ # ヒット判定 execute positioned ^ ^ ^ run tag @a[tag=!PlayerShouldInvulnerable,distance=..1.5] add 9G.Temp.Target.Attack execute positioned ^ ^ ^1.5 run tag @a[tag=!PlayerShouldInvulnerable,distance=..1.5] add 9G.Temp.Target.Attack - execute as @a[tag=9G.Temp.Target.Attack] at @s if block ~ ~-0.7 ~ #lib:no_collision run tag @s add 9G.Temp.Target.JumpAvoid + execute as @a[tag=9G.Temp.Target.Attack] at @s if block ~ ~-0.7 ~ #lib:no_collision/ run tag @s add 9G.Temp.Target.JumpAvoid tag @a[tag=9G.Temp.Target.JumpAvoid] remove 9G.Temp.Target.Attack # TODO:ダメージ diff --git a/Asset/data/asset/functions/mob/0340.twins_rubiel/tick/app/skill/event_handler/03_2_kt_movetospear/7.1.schedule_movetospear.mcfunction b/Asset/data/asset/functions/mob/0340.twins_rubiel/tick/app/skill/event_handler/03_2_kt_movetospear/7.1.schedule_movetospear.mcfunction index f70654c1bb5..afbb30e9b22 100644 --- a/Asset/data/asset/functions/mob/0340.twins_rubiel/tick/app/skill/event_handler/03_2_kt_movetospear/7.1.schedule_movetospear.mcfunction +++ b/Asset/data/asset/functions/mob/0340.twins_rubiel/tick/app/skill/event_handler/03_2_kt_movetospear/7.1.schedule_movetospear.mcfunction @@ -8,7 +8,7 @@ # function asset:mob/0340.twins_rubiel/rejoin_process/ # 着地したプレイヤーにて実行 - execute as @a[tag=9G.Temp.Target.JumpAvoid] at @s unless block ~ ~-0.1 ~ #lib:no_collision run function asset:mob/0340.twins_rubiel/tick/app/skill/event_handler/03_2_kt_movetospear/7.2.schedule_player_land + execute as @a[tag=9G.Temp.Target.JumpAvoid] at @s unless block ~ ~-0.1 ~ #lib:no_collision/ run function asset:mob/0340.twins_rubiel/tick/app/skill/event_handler/03_2_kt_movetospear/7.2.schedule_player_land # 再帰 execute if entity @a[tag=9G.Temp.Target.JumpAvoid] run schedule function asset:mob/0340.twins_rubiel/tick/app/skill/event_handler/03_2_kt_movetospear/7.1.schedule_movetospear 1t replace diff --git a/Asset/data/asset/functions/mob/0340.twins_rubiel/tick/app/skill/event_handler/05_1_kt_setwarp/5.3.damage_spear.mcfunction b/Asset/data/asset/functions/mob/0340.twins_rubiel/tick/app/skill/event_handler/05_1_kt_setwarp/5.3.damage_spear.mcfunction index 8698b418b44..001686bcbcc 100644 --- a/Asset/data/asset/functions/mob/0340.twins_rubiel/tick/app/skill/event_handler/05_1_kt_setwarp/5.3.damage_spear.mcfunction +++ b/Asset/data/asset/functions/mob/0340.twins_rubiel/tick/app/skill/event_handler/05_1_kt_setwarp/5.3.damage_spear.mcfunction @@ -8,7 +8,7 @@ # ヒット判定 execute positioned ^ ^ ^ run tag @a[tag=!PlayerShouldInvulnerable,distance=..1.5] add 9G.Temp.Target.Attack execute positioned ^ ^ ^1.5 run tag @a[tag=!PlayerShouldInvulnerable,distance=..1.5] add 9G.Temp.Target.Attack - execute as @a[tag=9G.Temp.Target.Attack] at @s if block ~ ~-0.7 ~ #lib:no_collision run tag @s add 9G.Temp.Target.JumpAvoid + execute as @a[tag=9G.Temp.Target.Attack] at @s if block ~ ~-0.7 ~ #lib:no_collision/ run tag @s add 9G.Temp.Target.JumpAvoid tag @a[tag=9G.Temp.Target.JumpAvoid] remove 9G.Temp.Target.Attack # TODO:ダメージ diff --git a/Asset/data/asset/functions/mob/0340.twins_rubiel/tick/app/skill/event_handler/05_1_kt_setwarp/7.1.schedule_movetospear.mcfunction b/Asset/data/asset/functions/mob/0340.twins_rubiel/tick/app/skill/event_handler/05_1_kt_setwarp/7.1.schedule_movetospear.mcfunction index 04c95c07600..d1446c0c32e 100644 --- a/Asset/data/asset/functions/mob/0340.twins_rubiel/tick/app/skill/event_handler/05_1_kt_setwarp/7.1.schedule_movetospear.mcfunction +++ b/Asset/data/asset/functions/mob/0340.twins_rubiel/tick/app/skill/event_handler/05_1_kt_setwarp/7.1.schedule_movetospear.mcfunction @@ -7,7 +7,7 @@ # function asset:mob/0340.twins_rubiel/tick/app/skill/event_handler/05_1_kt_setwarp/7.1.schedule_movetospear # 着地したプレイヤーにて実行 - execute as @a[tag=9G.Temp.Target.JumpAvoid] at @s unless block ~ ~-0.1 ~ #lib:no_collision run function asset:mob/0340.twins_rubiel/tick/app/skill/event_handler/05_1_kt_setwarp/7.2.schedule_player_land + execute as @a[tag=9G.Temp.Target.JumpAvoid] at @s unless block ~ ~-0.1 ~ #lib:no_collision/ run function asset:mob/0340.twins_rubiel/tick/app/skill/event_handler/05_1_kt_setwarp/7.2.schedule_player_land # 再帰 execute if entity @a[tag=9G.Temp.Target.JumpAvoid] run schedule function asset:mob/0340.twins_rubiel/tick/app/skill/event_handler/05_1_kt_setwarp/7.1.schedule_movetospear 1t replace diff --git a/Asset/data/asset/functions/mob/0341.louvert/tick/animation/14_1_falling_strike/tp_downer.mcfunction b/Asset/data/asset/functions/mob/0341.louvert/tick/animation/14_1_falling_strike/tp_downer.mcfunction index ab173b28c67..3526716b5ef 100644 --- a/Asset/data/asset/functions/mob/0341.louvert/tick/animation/14_1_falling_strike/tp_downer.mcfunction +++ b/Asset/data/asset/functions/mob/0341.louvert/tick/animation/14_1_falling_strike/tp_downer.mcfunction @@ -8,8 +8,8 @@ # ループ処理 scoreboard players set $9H.Temp Temporary 32 - execute if block ~ ~ ~ #lib:no_collision unless block ~ ~-0.25 ~ #lib:no_collision run scoreboard players set $9H.Temp Temporary -100 + execute if block ~ ~ ~ #lib:no_collision/ unless block ~ ~-0.25 ~ #lib:no_collision/ run scoreboard players set $9H.Temp Temporary -100 execute if score $9H.Temp Temporary matches 1.. run function asset:mob/0341.louvert/tick/animation/14_1_falling_strike/tp_downer_loop # リセット - scoreboard players reset $9H.Temp Temporary \ No newline at end of file + scoreboard players reset $9H.Temp Temporary diff --git a/Asset/data/asset/functions/mob/0341.louvert/tick/animation/14_1_falling_strike/tp_downer_loop.mcfunction b/Asset/data/asset/functions/mob/0341.louvert/tick/animation/14_1_falling_strike/tp_downer_loop.mcfunction index 430cc833fa4..62e3915699a 100644 --- a/Asset/data/asset/functions/mob/0341.louvert/tick/animation/14_1_falling_strike/tp_downer_loop.mcfunction +++ b/Asset/data/asset/functions/mob/0341.louvert/tick/animation/14_1_falling_strike/tp_downer_loop.mcfunction @@ -1,6 +1,6 @@ #> asset:mob/0341.louvert/tick/animation/14_1_falling_strike/tp_downer_loop # -# +# # # @within function # asset:mob/0341.louvert/tick/animation/14_1_falling_strike/tp_downer @@ -9,5 +9,5 @@ # 少し下げて判定 scoreboard players remove $9H.Temp Temporary 1 tp @s ~ ~-0.25 ~ ~ ~ - execute at @s if block ~ ~ ~ #lib:no_collision unless block ~ ~-0.25 ~ #lib:no_collision run scoreboard players set $9H.Temp Temporary -100 - execute at @s if score $9H.Temp Temporary matches 1.. run function asset:mob/0341.louvert/tick/animation/14_1_falling_strike/tp_downer_loop \ No newline at end of file + execute at @s if block ~ ~ ~ #lib:no_collision/ unless block ~ ~-0.25 ~ #lib:no_collision/ run scoreboard players set $9H.Temp Temporary -100 + execute at @s if score $9H.Temp Temporary matches 1.. run function asset:mob/0341.louvert/tick/animation/14_1_falling_strike/tp_downer_loop diff --git a/Asset/data/asset/functions/mob/0341.louvert/tick/animation/15_2_final_spell_iai/iai_cast_loop.mcfunction b/Asset/data/asset/functions/mob/0341.louvert/tick/animation/15_2_final_spell_iai/iai_cast_loop.mcfunction index a8763d43488..e7edaa80f56 100644 --- a/Asset/data/asset/functions/mob/0341.louvert/tick/animation/15_2_final_spell_iai/iai_cast_loop.mcfunction +++ b/Asset/data/asset/functions/mob/0341.louvert/tick/animation/15_2_final_spell_iai/iai_cast_loop.mcfunction @@ -1,6 +1,6 @@ #> asset:mob/0341.louvert/tick/animation/15_2_final_spell_iai/iai_cast_loop # -# +# # # @within function # asset:mob/0341.louvert/tick/animation/15_2_final_spell_iai/iai_cast @@ -12,4 +12,4 @@ particle sonic_boom ^ ^ ^ 0 0 0 0 1 force @a[distance=..32] particle soul_fire_flame ^ ^ ^ 1 1 1 0.01 10 force @a[distance=..32] function asset:mob/0341.louvert/tick/general/1.teleport - execute if score $9H.Temp Temporary matches 1.. positioned ^ ^ ^1.5 if block ~ ~ ~ #lib:no_collision run function asset:mob/0341.louvert/tick/animation/15_2_final_spell_iai/iai_cast_loop \ No newline at end of file + execute if score $9H.Temp Temporary matches 1.. positioned ^ ^ ^1.5 if block ~ ~ ~ #lib:no_collision/ run function asset:mob/0341.louvert/tick/animation/15_2_final_spell_iai/iai_cast_loop diff --git a/Asset/data/asset/functions/mob/0341.louvert/tick/animation/6_1_move_start/move_point_setting_loop.mcfunction b/Asset/data/asset/functions/mob/0341.louvert/tick/animation/6_1_move_start/move_point_setting_loop.mcfunction index 93e0e401b77..fddd27a8df6 100644 --- a/Asset/data/asset/functions/mob/0341.louvert/tick/animation/6_1_move_start/move_point_setting_loop.mcfunction +++ b/Asset/data/asset/functions/mob/0341.louvert/tick/animation/6_1_move_start/move_point_setting_loop.mcfunction @@ -15,6 +15,6 @@ # 拡散する execute as 0-0-0-0-0 at @s run function lib:spread_entity/ # 空気ならOK - execute as 0-0-0-0-0 at @s unless block ~ ~ ~ #lib:no_collision run scoreboard players set $9H.Temp Temporary 0 + execute as 0-0-0-0-0 at @s unless block ~ ~ ~ #lib:no_collision/ run scoreboard players set $9H.Temp Temporary 0 # ループ処理 - execute if score $9H.Temp Temporary matches 1.. run function asset:mob/0341.louvert/tick/animation/6_1_move_start/move_point_setting_loop \ No newline at end of file + execute if score $9H.Temp Temporary matches 1.. run function asset:mob/0341.louvert/tick/animation/6_1_move_start/move_point_setting_loop diff --git a/Asset/data/asset/functions/mob/0341.louvert/tick/general/1.teleport.mcfunction b/Asset/data/asset/functions/mob/0341.louvert/tick/general/1.teleport.mcfunction index 647b66da8ac..4d909fb449d 100644 --- a/Asset/data/asset/functions/mob/0341.louvert/tick/general/1.teleport.mcfunction +++ b/Asset/data/asset/functions/mob/0341.louvert/tick/general/1.teleport.mcfunction @@ -5,4 +5,4 @@ # @within function asset:mob/0341.louvert/** # 壁の中にはテレポートしない - execute if block ~ ~ ~ #lib:no_collision run tp @s ~ ~ ~ ~ ~ + execute if block ~ ~ ~ #lib:no_collision/ run tp @s ~ ~ ~ ~ ~ diff --git a/Asset/data/asset/functions/mob/0363.white_spellbook/tick/.mcfunction b/Asset/data/asset/functions/mob/0363.white_spellbook/tick/.mcfunction index 81b621dc207..f166f7af2eb 100644 --- a/Asset/data/asset/functions/mob/0363.white_spellbook/tick/.mcfunction +++ b/Asset/data/asset/functions/mob/0363.white_spellbook/tick/.mcfunction @@ -14,8 +14,8 @@ execute if entity @s[scores={General.Mob.Tick=0..}] run function asset:mob/0363.white_spellbook/tick/magic # 接地で上を向く - execute unless block ~ ~-0.1 ~ #lib:no_collision at @s run tp @s ~ ~ ~ ~ ~-35 - execute unless block ~ ~1 ~ #lib:no_collision at @s run tp @s ~ ~ ~ ~ ~80 + execute unless block ~ ~-0.1 ~ #lib:no_collision/ at @s run tp @s ~ ~ ~ ~ ~-35 + execute unless block ~ ~1 ~ #lib:no_collision/ at @s run tp @s ~ ~ ~ ~ ~80 # 移動スコア scoreboard players add @s A3.MoveTimer 1 @@ -28,5 +28,5 @@ execute if entity @s[scores={A3.MoveTimer=120..}] run scoreboard players reset @s A3.MoveTimer # カベにぶつかった際の処理 - execute unless block ^ ^ ^0.5 #lib:no_collision at @s run tp @s ~ ~ ~ ~45 ~-45 - execute at @s unless block ^ ^ ^0.2 #lib:no_collision at @s run tp @s ~ ~ ~ ~45 ~-45 + execute unless block ^ ^ ^0.5 #lib:no_collision/ at @s run tp @s ~ ~ ~ ~45 ~-45 + execute at @s unless block ^ ^ ^0.2 #lib:no_collision/ at @s run tp @s ~ ~ ~ ~45 ~-45 diff --git a/Asset/data/asset/functions/mob/0369.prominence_spellbook/tick/.mcfunction b/Asset/data/asset/functions/mob/0369.prominence_spellbook/tick/.mcfunction index ac6e9164bed..fc166eb5b11 100644 --- a/Asset/data/asset/functions/mob/0369.prominence_spellbook/tick/.mcfunction +++ b/Asset/data/asset/functions/mob/0369.prominence_spellbook/tick/.mcfunction @@ -8,18 +8,18 @@ particle enchant ~ ~1.68 ~ 0.25 0.25 0.25 0 2 force @a[distance=..40] # 接地で上を向く - execute unless block ~ ~-0.1 ~ #lib:no_collision at @s run tp @s ~ ~ ~ ~ ~-35 - execute unless block ~ ~1 ~ #lib:no_collision at @s run tp @s ~ ~ ~ ~ ~80 + execute unless block ~ ~-0.1 ~ #lib:no_collision/ at @s run tp @s ~ ~ ~ ~ ~-35 + execute unless block ~ ~1 ~ #lib:no_collision/ at @s run tp @s ~ ~ ~ ~ ~80 # 移動 execute unless entity @s[scores={A9.StepBack=0..}] facing entity @p[gamemode=!spectator] eyes positioned ^ ^ ^-100 rotated as @s positioned ^ ^ ^-800 facing entity @s eyes positioned as @s run tp @s ^ ^ ^0.3 ~ ~ # 後退モード時は速度が下がる # 幾何学の処理をしてかつ、後ろがブロックじゃないかつ、足元がブロックじゃなければ後退 - execute if entity @s[scores={A9.StepBack=0..}] facing entity @p[gamemode=!spectator] eyes positioned ^ ^ ^-100 rotated as @s positioned ^ ^ ^-800 facing entity @s eyes positioned as @s positioned ~ ~1.8 ~ if block ^ ^ ^-0.1 #lib:no_collision positioned ~ ~-1.8 ~ if block ~ ~0 ~ #lib:no_collision if block ~ ~1.5 ~ #lib:no_collision run tp @s ^ ^ ^-0.1 ~ ~ + execute if entity @s[scores={A9.StepBack=0..}] facing entity @p[gamemode=!spectator] eyes positioned ^ ^ ^-100 rotated as @s positioned ^ ^ ^-800 facing entity @s eyes positioned as @s positioned ~ ~1.8 ~ if block ^ ^ ^-0.1 #lib:no_collision/ positioned ~ ~-1.8 ~ if block ~ ~0 ~ #lib:no_collision/ if block ~ ~1.5 ~ #lib:no_collision/ run tp @s ^ ^ ^-0.1 ~ ~ # もし後退モードで足元がブロックなら下を向いて脱出 - execute if entity @s[scores={A9.StepBack=0..}] at @s unless block ~ ~0 ~ #lib:no_collision run tp @s ~ ~0.3 ~ ~ 90 + execute if entity @s[scores={A9.StepBack=0..}] at @s unless block ~ ~0 ~ #lib:no_collision/ run tp @s ~ ~0.3 ~ ~ 90 # プレイヤーが近くにいるとき、3秒間後退モードになる execute if entity @p[distance=..5] unless entity @s[scores={A9.StepBack=0..}] run scoreboard players set @s A9.StepBack 60 @@ -31,8 +31,8 @@ execute if entity @s[scores={A9.StepBack=0..}] run scoreboard players remove @s A9.StepBack 1 # 後退モードじゃない時、カベにぶつかった際の処理 - execute unless entity @s[scores={A9.StepBack=0..}] unless block ^ ^ ^0.5 #lib:no_collision at @s run tp @s ~ ~ ~ ~45 ~-45 - execute unless entity @s[scores={A9.StepBack=0..}] at @s unless block ^ ^ ^0.3 #lib:no_collision at @s run tp @s ~ ~ ~ ~45 ~-45 + execute unless entity @s[scores={A9.StepBack=0..}] unless block ^ ^ ^0.5 #lib:no_collision/ at @s run tp @s ~ ~ ~ ~45 ~-45 + execute unless entity @s[scores={A9.StepBack=0..}] at @s unless block ^ ^ ^0.3 #lib:no_collision/ at @s run tp @s ~ ~ ~ ~45 ~-45 # スコア scoreboard players add @s General.Mob.Tick 1 diff --git a/Asset/data/asset/functions/mob/0370.wave_spellbook/tick/.mcfunction b/Asset/data/asset/functions/mob/0370.wave_spellbook/tick/.mcfunction index 0e3e66529e9..a58e46498b6 100644 --- a/Asset/data/asset/functions/mob/0370.wave_spellbook/tick/.mcfunction +++ b/Asset/data/asset/functions/mob/0370.wave_spellbook/tick/.mcfunction @@ -8,8 +8,8 @@ particle enchant ~ ~1.68 ~ 0.25 0.25 0.25 0 2 force @a[distance=..40] # 接地で上を向く - execute unless block ~ ~-0.1 ~ #lib:no_collision at @s run tp @s ~ ~ ~ ~ ~-35 - execute unless block ~ ~1 ~ #lib:no_collision at @s run tp @s ~ ~ ~ ~ ~80 + execute unless block ~ ~-0.1 ~ #lib:no_collision/ at @s run tp @s ~ ~ ~ ~ ~-35 + execute unless block ~ ~1 ~ #lib:no_collision/ at @s run tp @s ~ ~ ~ ~ ~80 # 移動 # プレイヤーが近くにいれば直進、いなければ誘導 @@ -17,8 +17,8 @@ execute unless entity @p[gamemode=!spectator,distance=..6] facing entity @p[gamemode=!spectator] eyes positioned ^ ^ ^-100 rotated as @s positioned ^ ^ ^-800 facing entity @s eyes positioned as @s run tp @s ^ ^ ^0.2 ~ ~ # カベにぶつかった際の処理 - execute unless block ^ ^ ^0.5 #lib:no_collision at @s run tp @s ~ ~ ~ ~45 ~-45 - execute at @s unless block ^ ^ ^0.2 #lib:no_collision at @s run tp @s ~ ~ ~ ~45 ~-45 + execute unless block ^ ^ ^0.5 #lib:no_collision/ at @s run tp @s ~ ~ ~ ~45 ~-45 + execute at @s unless block ^ ^ ^0.2 #lib:no_collision/ at @s run tp @s ~ ~ ~ ~45 ~-45 # スコア scoreboard players add @s General.Mob.Tick 1 diff --git a/Asset/data/asset/functions/mob/0371.lightning_spellbook/tick/.mcfunction b/Asset/data/asset/functions/mob/0371.lightning_spellbook/tick/.mcfunction index 78f62d2cddc..02b2683410e 100644 --- a/Asset/data/asset/functions/mob/0371.lightning_spellbook/tick/.mcfunction +++ b/Asset/data/asset/functions/mob/0371.lightning_spellbook/tick/.mcfunction @@ -20,8 +20,8 @@ # ここより下は移動処理 # 接地で上を向く - execute unless block ~ ~-0.1 ~ #lib:no_collision at @s run tp @s ~ ~ ~ ~ ~-35 - execute unless block ~ ~1 ~ #lib:no_collision at @s run tp @s ~ ~ ~ ~ ~80 + execute unless block ~ ~-0.1 ~ #lib:no_collision/ at @s run tp @s ~ ~ ~ ~ ~-35 + execute unless block ~ ~1 ~ #lib:no_collision/ at @s run tp @s ~ ~ ~ ~ ~80 # 下にプレイヤーがいるか判定 execute positioned ~-1.5 ~ ~-1.5 if entity @p[dx=2,dy=-2.5,dz=2] at @s run tag @s add OnTop @@ -40,11 +40,11 @@ tag @s[tag=OnTop] remove OnTop # プレイヤーが近くにいたら上に移動 - execute at @s if entity @p[distance=..4] if block ~ ~2.2 ~ #lib:no_collision run tp @s ~ ~0.2 ~ + execute at @s if entity @p[distance=..4] if block ~ ~2.2 ~ #lib:no_collision/ run tp @s ~ ~0.2 ~ # 不定期に急加速 execute if predicate lib:random_pass_per/1 at @s run tp @s ^ ^ ^0.5 # カベにぶつかった際の処理 - execute unless block ^ ^ ^0.5 #lib:no_collision at @s run tp @s ~ ~ ~ ~45 ~-45 - execute at @s unless block ^ ^ ^0.2 #lib:no_collision at @s run tp @s ~ ~ ~ ~45 ~-45 + execute unless block ^ ^ ^0.5 #lib:no_collision/ at @s run tp @s ~ ~ ~ ~45 ~-45 + execute at @s unless block ^ ^ ^0.2 #lib:no_collision/ at @s run tp @s ~ ~ ~ ~45 ~-45 diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/.mcfunction index b8fdb522c58..8f297ea02a6 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/.mcfunction @@ -33,16 +33,16 @@ execute if entity @s[tag=AC.Health.50Per,tag=!AC.Moveset.Transition] if predicate lib:random_pass_per/50 run particle dust 0 1 1 1 ~ ~1 ~ 0.3 0.5 0.3 0.02 1 force @a[distance=..64] # 足元に何もなければ - execute if block ~ ~-0.2 ~ #lib:no_collision run particle minecraft:enchant ~ ~ ~ 0.4 0 0.4 0 10 + execute if block ~ ~-0.2 ~ #lib:no_collision/ run particle minecraft:enchant ~ ~ ~ 0.4 0 0.4 0 10 # スタックに対するカウンター、ブロック破壊が可能なエリアでのみ行う execute if predicate api:area/is_breakable run function asset:mob/0372.tutankhamen/tick/stuck_revenge/ # 足元が埋まっていて、上にブロックがないなら上に移動 - execute unless block ~ ~ ~ #lib:no_collision if block ~ ~2.5 ~ #lib:no_collision run tp @s ~ ~0.1 ~ + execute unless block ~ ~ ~ #lib:no_collision/ if block ~ ~2.5 ~ #lib:no_collision/ run tp @s ~ ~0.1 ~ # 頭上にブロックがあって、下にブロックがないなら下に移動 - execute unless block ~ ~2.5 ~ #lib:no_collision if block ~ ~-1 ~ #lib:no_collision run tp @s ~ ~-0.1 ~ + execute unless block ~ ~2.5 ~ #lib:no_collision/ if block ~ ~-1 ~ #lib:no_collision/ run tp @s ~ ~-0.1 ~ # そこらのプレイヤーより下にいる場合、上昇する execute positioned ~-50 ~ ~-50 unless entity @a[dx=99,dy=-50,dz=99] at @s[tag=!AC.Opening,tag=!AC.InAction] run tp @s ~ ~0.1 ~ diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/common/check_collide/back/0.5.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/common/check_collide/back/0.5.mcfunction index 6e602db99ad..28e8fff2b7f 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/common/check_collide/back/0.5.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/common/check_collide/back/0.5.mcfunction @@ -4,5 +4,5 @@ # # @within function asset:mob/0372.tutankhamen/tick/skill/** -execute unless block ^ ^ ^-0.5 #lib:no_collision run return 1 -execute anchored eyes unless block ^ ^ ^-0.5 #lib:no_collision run return 1 +execute unless block ^ ^ ^-0.5 #lib:no_collision/ run return 1 +execute anchored eyes unless block ^ ^ ^-0.5 #lib:no_collision/ run return 1 diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/common/check_collide/forward/1.0.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/common/check_collide/forward/1.0.mcfunction index c28aca65194..cebf0e14a65 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/common/check_collide/forward/1.0.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/common/check_collide/forward/1.0.mcfunction @@ -4,7 +4,7 @@ # # @within function asset:mob/0372.tutankhamen/tick/skill/** -execute unless block ^ ^ ^0.5 #lib:no_collision run return 1 -execute unless block ^ ^ ^1.0 #lib:no_collision run return 1 -execute anchored eyes unless block ^ ^ ^0.5 #lib:no_collision run return 1 -execute anchored eyes unless block ^ ^ ^1.0 #lib:no_collision run return 1 +execute unless block ^ ^ ^0.5 #lib:no_collision/ run return 1 +execute unless block ^ ^ ^1.0 #lib:no_collision/ run return 1 +execute anchored eyes unless block ^ ^ ^0.5 #lib:no_collision/ run return 1 +execute anchored eyes unless block ^ ^ ^1.0 #lib:no_collision/ run return 1 diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/common/check_collide/forward/1.5.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/common/check_collide/forward/1.5.mcfunction index 755fc1ccd1b..d410af8936b 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/common/check_collide/forward/1.5.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/common/check_collide/forward/1.5.mcfunction @@ -4,10 +4,10 @@ # # @within function asset:mob/0372.tutankhamen/tick/skill/** -execute unless block ^ ^ ^0.5 #lib:no_collision run return 1 -execute unless block ^ ^ ^1.0 #lib:no_collision run return 1 -execute unless block ^ ^ ^1.5 #lib:no_collision run return 1 +execute unless block ^ ^ ^0.5 #lib:no_collision/ run return 1 +execute unless block ^ ^ ^1.0 #lib:no_collision/ run return 1 +execute unless block ^ ^ ^1.5 #lib:no_collision/ run return 1 -execute anchored eyes unless block ^ ^ ^0.5 #lib:no_collision run return 1 -execute anchored eyes unless block ^ ^ ^1.0 #lib:no_collision run return 1 -execute anchored eyes unless block ^ ^ ^1.5 #lib:no_collision run return 1 +execute anchored eyes unless block ^ ^ ^0.5 #lib:no_collision/ run return 1 +execute anchored eyes unless block ^ ^ ^1.0 #lib:no_collision/ run return 1 +execute anchored eyes unless block ^ ^ ^1.5 #lib:no_collision/ run return 1 diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/hyper_laser/.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/hyper_laser/.mcfunction index dee85872734..7ac2a3aa46d 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/hyper_laser/.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/hyper_laser/.mcfunction @@ -12,7 +12,7 @@ execute if score @s General.Mob.Tick matches 23 at @e[type=marker,tag=AC.ModelLocator.Weapon] run particle crit ~ ~ ~ 0 0 0 0.5 25 # 降りる - execute if score @s General.Mob.Tick matches 0..20 if block ~ ~-0.1 ~ #lib:no_collision if function asset:mob/0372.tutankhamen/tick/skill/hyper_laser/check_ground run tp @s ~ ~-0.1 ~ + execute if score @s General.Mob.Tick matches 0..20 if block ~ ~-0.1 ~ #lib:no_collision/ if function asset:mob/0372.tutankhamen/tick/skill/hyper_laser/check_ground run tp @s ~ ~-0.1 ~ # プレイヤーの方を向く execute if score @s General.Mob.Tick matches 0..20 facing entity @p[gamemode=!spectator] feet positioned ^ ^ ^-10 rotated as @s positioned ^ ^ ^-40 facing entity @s feet positioned as @s rotated ~ 0 run tp @s ^ ^ ^ ~ ~ diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/hyper_laser/check_ground.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/hyper_laser/check_ground.mcfunction index abfe58084bb..2ed10b38c30 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/hyper_laser/check_ground.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/hyper_laser/check_ground.mcfunction @@ -7,5 +7,5 @@ # asset:mob/0372.tutankhamen/tick/skill/hyper_laser/check_ground execute unless entity @s[distance=..10] run return fail -execute unless block ~ ~ ~ #lib:no_collision run return 1 -execute if block ~ ~ ~ #lib:no_collision positioned ~ ~-1 ~ run return run function asset:mob/0372.tutankhamen/tick/skill/hyper_laser/check_ground +execute unless block ~ ~ ~ #lib:no_collision/ run return 1 +execute if block ~ ~ ~ #lib:no_collision/ positioned ~ ~-1 ~ run return run function asset:mob/0372.tutankhamen/tick/skill/hyper_laser/check_ground diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/stuck_revenge/.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/stuck_revenge/.mcfunction index c0c401cd7e6..b971ca689d2 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/stuck_revenge/.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/stuck_revenge/.mcfunction @@ -5,10 +5,10 @@ # @within function asset:mob/0372.tutankhamen/tick/ # 頭がめり込んでいる場合、カウント付与。 - execute unless block ~ ~2.5 ~ #lib:no_collision run scoreboard players add @s AC.Count.Stuck 1 + execute unless block ~ ~2.5 ~ #lib:no_collision/ run scoreboard players add @s AC.Count.Stuck 1 # 頭がめり込んでなければカウントが減少 - execute if block ~ ~2.5 ~ #lib:no_collision unless score @s AC.Count.Stuck matches ..-1 run scoreboard players remove @s AC.Count.Stuck 1 + execute if block ~ ~2.5 ~ #lib:no_collision/ unless score @s AC.Count.Stuck matches ..-1 run scoreboard players remove @s AC.Count.Stuck 1 # カウント一定以上でガタガタ音がなる scoreboard players operation $Interval Temporary = @s General.Mob.Tick diff --git a/Asset/data/asset/functions/mob/0376.convict_v2/tick/common/spread_tp.mcfunction b/Asset/data/asset/functions/mob/0376.convict_v2/tick/common/spread_tp.mcfunction index f954ff10e48..91b453b4dcf 100644 --- a/Asset/data/asset/functions/mob/0376.convict_v2/tick/common/spread_tp.mcfunction +++ b/Asset/data/asset/functions/mob/0376.convict_v2/tick/common/spread_tp.mcfunction @@ -10,10 +10,10 @@ function lib:spread_entity/ # 埋まり対策（これで埋まってたら知らん） - execute at @s unless block ~ ~ ~ #lib:no_collision run data modify storage lib: Argument.Bounds set value [[3d,3d],[0d,0d],[3d,3d]] - execute at @s unless block ~ ~ ~ #lib:no_collision run function lib:spread_entity/ - execute at @s unless block ~ ~ ~ #lib:no_collision run data modify storage lib: Argument.Bounds set value [[3d,3d],[0d,0d],[3d,3d]] - execute at @s unless block ~ ~ ~ #lib:no_collision run function lib:spread_entity/ + execute at @s unless block ~ ~ ~ #lib:no_collision/ run data modify storage lib: Argument.Bounds set value [[3d,3d],[0d,0d],[3d,3d]] + execute at @s unless block ~ ~ ~ #lib:no_collision/ run function lib:spread_entity/ + execute at @s unless block ~ ~ ~ #lib:no_collision/ run data modify storage lib: Argument.Bounds set value [[3d,3d],[0d,0d],[3d,3d]] + execute at @s unless block ~ ~ ~ #lib:no_collision/ run function lib:spread_entity/ # ディスプレイもってくる用 execute at @s run function asset:mob/0376.convict_v2/tick/common/tp diff --git a/Asset/data/asset/functions/mob/0376.convict_v2/tick/common/tp.mcfunction b/Asset/data/asset/functions/mob/0376.convict_v2/tick/common/tp.mcfunction index 8f7d22d60b3..133878eabc6 100644 --- a/Asset/data/asset/functions/mob/0376.convict_v2/tick/common/tp.mcfunction +++ b/Asset/data/asset/functions/mob/0376.convict_v2/tick/common/tp.mcfunction @@ -5,6 +5,6 @@ # @within function asset:mob/0376.convict_v2/tick/** # 自身をその場所まで持っていく(雑床埋まり対策もする) - execute if block ~ ~ ~ #lib:no_collision run tp @s ~ ~ ~ ~ ~ - execute unless block ~ ~ ~ #lib:no_collision run tp @s ~ ~0.1 ~ ~ ~ + execute if block ~ ~ ~ #lib:no_collision/ run tp @s ~ ~ ~ ~ ~ + execute unless block ~ ~ ~ #lib:no_collision/ run tp @s ~ ~0.1 ~ ~ ~ execute at @s rotated ~ 0 run tp @e[type=item_display,tag=AG.AJ,tag=AG.AJLink,distance=..100,sort=nearest,limit=1] ~ ~ ~ ~ ~ diff --git a/Asset/data/asset/functions/mob/0376.convict_v2/tick/skill_reset.mcfunction b/Asset/data/asset/functions/mob/0376.convict_v2/tick/skill_reset.mcfunction index e325bdacf4c..81f91c47541 100644 --- a/Asset/data/asset/functions/mob/0376.convict_v2/tick/skill_reset.mcfunction +++ b/Asset/data/asset/functions/mob/0376.convict_v2/tick/skill_reset.mcfunction @@ -10,13 +10,13 @@ execute if predicate api:global_vars/difficulty/1_normal run scoreboard players set @s General.Mob.Tick -45 # 足元空気なら下にいく - execute at @s if block ~ ~-0.5 ~ #lib:no_collision positioned ~ ~-0.5 ~ run function asset:mob/0376.convict_v2/tick/common/tp - execute at @s if block ~ ~-0.5 ~ #lib:no_collision positioned ~ ~-0.5 ~ run function asset:mob/0376.convict_v2/tick/common/tp - execute at @s if block ~ ~-0.5 ~ #lib:no_collision positioned ~ ~-0.5 ~ run function asset:mob/0376.convict_v2/tick/common/tp - execute at @s if block ~ ~-0.5 ~ #lib:no_collision positioned ~ ~-0.5 ~ run function asset:mob/0376.convict_v2/tick/common/tp + execute at @s if block ~ ~-0.5 ~ #lib:no_collision/ positioned ~ ~-0.5 ~ run function asset:mob/0376.convict_v2/tick/common/tp + execute at @s if block ~ ~-0.5 ~ #lib:no_collision/ positioned ~ ~-0.5 ~ run function asset:mob/0376.convict_v2/tick/common/tp + execute at @s if block ~ ~-0.5 ~ #lib:no_collision/ positioned ~ ~-0.5 ~ run function asset:mob/0376.convict_v2/tick/common/tp + execute at @s if block ~ ~-0.5 ~ #lib:no_collision/ positioned ~ ~-0.5 ~ run function asset:mob/0376.convict_v2/tick/common/tp # 埋まってたらTPする - execute at @s unless block ~ ~ ~ #lib:no_collision positioned as @p run function asset:mob/0376.convict_v2/tick/common/spread_tp + execute at @s unless block ~ ~ ~ #lib:no_collision/ positioned as @p run function asset:mob/0376.convict_v2/tick/common/spread_tp # アニメーション戻す execute as @e[type=item_display,tag=AG.AJ,tag=AG.AJLink,sort=nearest,limit=1] run function animated_java:convict/animations/wait/play diff --git a/Asset/data/asset/functions/mob/0378.red_knight_v3/tick/04.skill_knife/main.mcfunction b/Asset/data/asset/functions/mob/0378.red_knight_v3/tick/04.skill_knife/main.mcfunction index 316ae47c7ea..c0aa3943bc2 100644 --- a/Asset/data/asset/functions/mob/0378.red_knight_v3/tick/04.skill_knife/main.mcfunction +++ b/Asset/data/asset/functions/mob/0378.red_knight_v3/tick/04.skill_knife/main.mcfunction @@ -17,10 +17,10 @@ execute if score @s AI.Tick matches 0 run playsound minecraft:entity.zombie.infect hostile @a ~ ~ ~ 2 1.5 # 後ろに飛ぶ - execute if score @s AI.Tick matches 1 rotated ~ -10 positioned ~ ~2 ~ positioned ^ ^ ^-3 if block ~ ~ ~ #lib:no_collision run function asset:mob/0378.red_knight_v3/tick/common/tp - execute if score @s AI.Tick matches 2 rotated ~ 6 positioned ~ ~1 ~ positioned ^ ^ ^-2 if block ~ ~ ~ #lib:no_collision run function asset:mob/0378.red_knight_v3/tick/common/tp - execute if score @s AI.Tick matches 3 rotated ~ 3 positioned ~ ~0.1 ~ positioned ^ ^ ^-1 if block ~ ~ ~ #lib:no_collision run function asset:mob/0378.red_knight_v3/tick/common/tp - execute if score @s AI.Tick matches 4..16 rotated ~ -0 positioned ~ ~0 ~ positioned ^ ^ ^-0.25 if block ~ ~ ~ #lib:no_collision run function asset:mob/0378.red_knight_v3/tick/common/tp + execute if score @s AI.Tick matches 1 rotated ~ -10 positioned ~ ~2 ~ positioned ^ ^ ^-3 if block ~ ~ ~ #lib:no_collision/ run function asset:mob/0378.red_knight_v3/tick/common/tp + execute if score @s AI.Tick matches 2 rotated ~ 6 positioned ~ ~1 ~ positioned ^ ^ ^-2 if block ~ ~ ~ #lib:no_collision/ run function asset:mob/0378.red_knight_v3/tick/common/tp + execute if score @s AI.Tick matches 3 rotated ~ 3 positioned ~ ~0.1 ~ positioned ^ ^ ^-1 if block ~ ~ ~ #lib:no_collision/ run function asset:mob/0378.red_knight_v3/tick/common/tp + execute if score @s AI.Tick matches 4..16 rotated ~ -0 positioned ~ ~0 ~ positioned ^ ^ ^-0.25 if block ~ ~ ~ #lib:no_collision/ run function asset:mob/0378.red_knight_v3/tick/common/tp # 演出 execute if score @s AI.Tick matches 16 run playsound item.trident.throw hostile @a ~ ~ ~ 1 0.6 diff --git a/Asset/data/asset/functions/mob/0378.red_knight_v3/tick/05.skill_jump/falling.mcfunction b/Asset/data/asset/functions/mob/0378.red_knight_v3/tick/05.skill_jump/falling.mcfunction index 3cdb5f4b68c..5201f7d30d8 100644 --- a/Asset/data/asset/functions/mob/0378.red_knight_v3/tick/05.skill_jump/falling.mcfunction +++ b/Asset/data/asset/functions/mob/0378.red_knight_v3/tick/05.skill_jump/falling.mcfunction @@ -11,4 +11,4 @@ execute at @s positioned ~ ~-0.4 ~ run function asset:mob/0378.red_knight_v3/tick/common/tp execute at @s rotated ~ 0 run particle flame ^ ^1 ^1.2 0 0 0 0.01 2 # 着地 - execute at @s unless block ~ ~-0.3 ~ #lib:no_collision run scoreboard players set @s AI.Tick 1000 + execute at @s unless block ~ ~-0.3 ~ #lib:no_collision/ run scoreboard players set @s AI.Tick 1000 diff --git a/Asset/data/asset/functions/mob/0378.red_knight_v3/tick/06.skill_jump2/alert/search_ground.mcfunction b/Asset/data/asset/functions/mob/0378.red_knight_v3/tick/06.skill_jump2/alert/search_ground.mcfunction index 675f3f3ac64..93474ee8526 100644 --- a/Asset/data/asset/functions/mob/0378.red_knight_v3/tick/06.skill_jump2/alert/search_ground.mcfunction +++ b/Asset/data/asset/functions/mob/0378.red_knight_v3/tick/06.skill_jump2/alert/search_ground.mcfunction @@ -7,10 +7,10 @@ # asset:mob/0378.red_knight_v3/tick/06.skill_jump2/alert/search_ground # ブロックだったらパーティクル投影 - execute unless block ~ ~ ~ #lib:no_collision positioned ~ ~1 ~ run function asset:mob/0378.red_knight_v3/tick/06.skill_jump2/alert/alert + execute unless block ~ ~ ~ #lib:no_collision/ positioned ~ ~1 ~ run function asset:mob/0378.red_knight_v3/tick/06.skill_jump2/alert/alert # 奈落だったり、下が遠すぎたらそのまま実行 execute unless entity @s[distance=..16] run function asset:mob/0378.red_knight_v3/tick/06.skill_jump2/alert/alert # 下にずらして再帰 - execute if entity @s[distance=..16] if block ~ ~ ~ #lib:no_collision positioned ~ ~-1 ~ run function asset:mob/0378.red_knight_v3/tick/06.skill_jump2/alert/search_ground + execute if entity @s[distance=..16] if block ~ ~ ~ #lib:no_collision/ positioned ~ ~-1 ~ run function asset:mob/0378.red_knight_v3/tick/06.skill_jump2/alert/search_ground diff --git a/Asset/data/asset/functions/mob/0378.red_knight_v3/tick/06.skill_jump2/falling.mcfunction b/Asset/data/asset/functions/mob/0378.red_knight_v3/tick/06.skill_jump2/falling.mcfunction index 0135e2a9a23..3a2d5db679c 100644 --- a/Asset/data/asset/functions/mob/0378.red_knight_v3/tick/06.skill_jump2/falling.mcfunction +++ b/Asset/data/asset/functions/mob/0378.red_knight_v3/tick/06.skill_jump2/falling.mcfunction @@ -13,4 +13,4 @@ execute at @s positioned ~ ~-0.4 ~ run function asset:mob/0378.red_knight_v3/tick/common/tp execute at @s rotated ~ 0 run particle flame ^ ^1 ^1.2 0 0 0 0.01 2 # 着地 - execute at @s unless block ~ ~-0.3 ~ #lib:no_collision run scoreboard players set @s AI.Tick 200 + execute at @s unless block ~ ~-0.3 ~ #lib:no_collision/ run scoreboard players set @s AI.Tick 200 diff --git a/Asset/data/asset/functions/mob/0378.red_knight_v3/tick/91.fall/main.mcfunction b/Asset/data/asset/functions/mob/0378.red_knight_v3/tick/91.fall/main.mcfunction index 4285edb5662..934b8df0264 100644 --- a/Asset/data/asset/functions/mob/0378.red_knight_v3/tick/91.fall/main.mcfunction +++ b/Asset/data/asset/functions/mob/0378.red_knight_v3/tick/91.fall/main.mcfunction @@ -14,7 +14,7 @@ execute if score @s AI.Tick matches 4.. at @s positioned ~ ~-0.25 ~ run function asset:mob/0378.red_knight_v3/tick/common/tp # 地面についたらリセット - execute if score @s AI.Tick matches 0.. at @s unless block ~ ~-0.25 ~ #lib:no_collision run function asset:mob/0378.red_knight_v3/tick/skill_reset + execute if score @s AI.Tick matches 0.. at @s unless block ~ ~-0.25 ~ #lib:no_collision/ run function asset:mob/0378.red_knight_v3/tick/skill_reset # 地面につかない異常事態？プレイヤーにTPしてリセット execute if score @s AI.Tick matches 100 at @p run function asset:mob/0378.red_knight_v3/tick/common/tp diff --git a/Asset/data/asset/functions/mob/0378.red_knight_v3/tick/common/tp.mcfunction b/Asset/data/asset/functions/mob/0378.red_knight_v3/tick/common/tp.mcfunction index 473a94d0ca2..2ed8448c75e 100644 --- a/Asset/data/asset/functions/mob/0378.red_knight_v3/tick/common/tp.mcfunction +++ b/Asset/data/asset/functions/mob/0378.red_knight_v3/tick/common/tp.mcfunction @@ -5,6 +5,6 @@ # @within function asset:mob/0378.red_knight_v3/tick/** # 自身をその場所まで持っていく(雑床埋まり対策もする) - execute if block ~ ~ ~ #lib:no_collision run tp @s ~ ~ ~ ~ ~ - execute unless block ~ ~ ~ #lib:no_collision run tp @s ~ ~0.5 ~ ~ ~ + execute if block ~ ~ ~ #lib:no_collision/ run tp @s ~ ~ ~ ~ ~ + execute unless block ~ ~ ~ #lib:no_collision/ run tp @s ~ ~0.5 ~ ~ ~ execute at @s rotated ~ 0 run tp @e[type=item_display,tag=AI.AJ,tag=AI.AJLink,distance=..100,sort=nearest,limit=1] ~ ~ ~ ~ ~ diff --git a/Asset/data/asset/functions/mob/0378.red_knight_v3/tick/skill_reset.mcfunction b/Asset/data/asset/functions/mob/0378.red_knight_v3/tick/skill_reset.mcfunction index bfd1fa00e0d..584d7566d93 100644 --- a/Asset/data/asset/functions/mob/0378.red_knight_v3/tick/skill_reset.mcfunction +++ b/Asset/data/asset/functions/mob/0378.red_knight_v3/tick/skill_reset.mcfunction @@ -29,5 +29,5 @@ tag @s remove AI.Opening # 地面に着いていない時、落下スキルを発動 - execute if block ~ ~-0.5 ~ #lib:no_collision run scoreboard players set @s AI.Tick 0 - execute if block ~ ~-0.5 ~ #lib:no_collision run tag @s add AI.Skill91 + execute if block ~ ~-0.5 ~ #lib:no_collision/ run scoreboard players set @s AI.Tick 0 + execute if block ~ ~-0.5 ~ #lib:no_collision/ run tag @s add AI.Skill91 diff --git a/Asset/data/asset/functions/mob/0380.haruclaire_v3/tick/event/giant_blade/.mcfunction b/Asset/data/asset/functions/mob/0380.haruclaire_v3/tick/event/giant_blade/.mcfunction index 4e7c6ea2b27..7e0feaecce8 100644 --- a/Asset/data/asset/functions/mob/0380.haruclaire_v3/tick/event/giant_blade/.mcfunction +++ b/Asset/data/asset/functions/mob/0380.haruclaire_v3/tick/event/giant_blade/.mcfunction @@ -17,11 +17,11 @@ execute if score @s AK.EventTimer matches 1..10 at @s positioned ^ ^0.1 ^ run function asset:mob/0380.haruclaire_v3/tick/util/tp execute if entity @s[tag=!AK.Temp.FixedRotation] if score @s AK.EventTimer matches 1..58 run function asset:mob/0380.haruclaire_v3/tick/util/rotate_to_target execute if entity @s[tag=!AK.Temp.FixedRotation] if score @s AK.EventTimer matches 95..100 run function asset:mob/0380.haruclaire_v3/tick/util/rotate_to_target - execute if score @s AK.EventTimer matches 121..126 at @s if block ~ ~-0.7 ~ #lib:no_collision positioned ^ ^-0.2 ^ run function asset:mob/0380.haruclaire_v3/tick/util/tp - execute if score @s AK.EventTimer matches 123..126 at @s if block ~ ~-0.7 ~ #lib:no_collision positioned ^ ^-0.2 ^ run function asset:mob/0380.haruclaire_v3/tick/util/tp - execute if score @s AK.EventTimer matches 125..126 at @s if block ~ ~-0.7 ~ #lib:no_collision positioned ^ ^-0.2 ^ run function asset:mob/0380.haruclaire_v3/tick/util/tp + execute if score @s AK.EventTimer matches 121..126 at @s if block ~ ~-0.7 ~ #lib:no_collision/ positioned ^ ^-0.2 ^ run function asset:mob/0380.haruclaire_v3/tick/util/tp + execute if score @s AK.EventTimer matches 123..126 at @s if block ~ ~-0.7 ~ #lib:no_collision/ positioned ^ ^-0.2 ^ run function asset:mob/0380.haruclaire_v3/tick/util/tp + execute if score @s AK.EventTimer matches 125..126 at @s if block ~ ~-0.7 ~ #lib:no_collision/ positioned ^ ^-0.2 ^ run function asset:mob/0380.haruclaire_v3/tick/util/tp execute if score @s AK.EventTimer matches 128..135 at @s positioned ^ ^0.1 ^ run function asset:mob/0380.haruclaire_v3/tick/util/tp - execute if score @s AK.EventTimer matches 141.. at @s if block ~ ~-0.7 ~ #lib:no_collision positioned ^ ^-0.05 ^ run function asset:mob/0380.haruclaire_v3/tick/util/tp + execute if score @s AK.EventTimer matches 141.. at @s if block ~ ~-0.7 ~ #lib:no_collision/ positioned ^ ^-0.05 ^ run function asset:mob/0380.haruclaire_v3/tick/util/tp # 演出 execute if score @s AK.EventTimer matches 2 at @s run playsound disabled_sounds:item.armor.equip_leather hostile @a ~ ~ ~ 1 1.3 execute if score @s AK.EventTimer matches 20 at @s run playsound item.axe.scrape hostile @a ~ ~ ~ 1 2 diff --git a/Asset/data/asset/functions/mob/0380.haruclaire_v3/tick/event/giant_blade/short.mcfunction b/Asset/data/asset/functions/mob/0380.haruclaire_v3/tick/event/giant_blade/short.mcfunction index 3c8456a5f71..47389147501 100644 --- a/Asset/data/asset/functions/mob/0380.haruclaire_v3/tick/event/giant_blade/short.mcfunction +++ b/Asset/data/asset/functions/mob/0380.haruclaire_v3/tick/event/giant_blade/short.mcfunction @@ -16,10 +16,10 @@ # 移動 execute if score @s AK.EventTimer matches 1..10 at @s positioned ^ ^0.1 ^ run function asset:mob/0380.haruclaire_v3/tick/util/tp execute if entity @s[tag=!AK.Temp.FixedRotation] if score @s AK.EventTimer matches 1..58 run function asset:mob/0380.haruclaire_v3/tick/util/rotate_to_target - execute if score @s AK.EventTimer matches 87..91 at @s if block ~ ~-0.7 ~ #lib:no_collision positioned ^ ^-0.2 ^ run function asset:mob/0380.haruclaire_v3/tick/util/tp - execute if score @s AK.EventTimer matches 89..91 at @s if block ~ ~-0.7 ~ #lib:no_collision positioned ^ ^-0.2 ^ run function asset:mob/0380.haruclaire_v3/tick/util/tp + execute if score @s AK.EventTimer matches 87..91 at @s if block ~ ~-0.7 ~ #lib:no_collision/ positioned ^ ^-0.2 ^ run function asset:mob/0380.haruclaire_v3/tick/util/tp + execute if score @s AK.EventTimer matches 89..91 at @s if block ~ ~-0.7 ~ #lib:no_collision/ positioned ^ ^-0.2 ^ run function asset:mob/0380.haruclaire_v3/tick/util/tp execute if score @s AK.EventTimer matches 93..100 at @s positioned ^ ^0.1 ^ run function asset:mob/0380.haruclaire_v3/tick/util/tp - execute if score @s AK.EventTimer matches 106.. at @s if block ~ ~-0.7 ~ #lib:no_collision positioned ^ ^-0.05 ^ run function asset:mob/0380.haruclaire_v3/tick/util/tp + execute if score @s AK.EventTimer matches 106.. at @s if block ~ ~-0.7 ~ #lib:no_collision/ positioned ^ ^-0.05 ^ run function asset:mob/0380.haruclaire_v3/tick/util/tp # 演出 execute if score @s AK.EventTimer matches 2 at @s run playsound disabled_sounds:item.armor.equip_leather hostile @a ~ ~ ~ 1 1.3 diff --git a/Asset/data/asset/functions/mob/0380.haruclaire_v3/tick/event/ice_bullet/.mcfunction b/Asset/data/asset/functions/mob/0380.haruclaire_v3/tick/event/ice_bullet/.mcfunction index 13c11b77ce0..42900917d4b 100644 --- a/Asset/data/asset/functions/mob/0380.haruclaire_v3/tick/event/ice_bullet/.mcfunction +++ b/Asset/data/asset/functions/mob/0380.haruclaire_v3/tick/event/ice_bullet/.mcfunction @@ -28,8 +28,8 @@ execute if score @s AK.EventTimer matches 69 positioned ^ ^6 ^-4 run function asset:mob/0380.haruclaire_v3/tick/event/ice_bullet/attack_circle # 地面に戻る - execute if score @s AK.EventTimer matches 85..105 if block ~ ~-0.7 ~ #lib:no_collision positioned ^ ^-0.08 ^-0.02 run function asset:mob/0380.haruclaire_v3/tick/util/tp - execute if score @s AK.EventTimer matches 106..133 if block ~ ~-0.7 ~ #lib:no_collision positioned ^ ^-0.15 ^-0.02 run function asset:mob/0380.haruclaire_v3/tick/util/tp + execute if score @s AK.EventTimer matches 85..105 if block ~ ~-0.7 ~ #lib:no_collision/ positioned ^ ^-0.08 ^-0.02 run function asset:mob/0380.haruclaire_v3/tick/util/tp + execute if score @s AK.EventTimer matches 106..133 if block ~ ~-0.7 ~ #lib:no_collision/ positioned ^ ^-0.15 ^-0.02 run function asset:mob/0380.haruclaire_v3/tick/util/tp # 終了 execute if score @s AK.EventTimer matches 114.. run function asset:mob/0380.haruclaire_v3/tick/event/ice_bullet/end diff --git a/Asset/data/asset/functions/mob/0380.haruclaire_v3/tick/event/ice_laser/.mcfunction b/Asset/data/asset/functions/mob/0380.haruclaire_v3/tick/event/ice_laser/.mcfunction index 5eecb9b1888..1db7a9a6c96 100644 --- a/Asset/data/asset/functions/mob/0380.haruclaire_v3/tick/event/ice_laser/.mcfunction +++ b/Asset/data/asset/functions/mob/0380.haruclaire_v3/tick/event/ice_laser/.mcfunction @@ -28,7 +28,7 @@ execute if score @s AK.EventTimer matches 72..121 if predicate api:global_vars/difficulty/min/2_hard at @s run function asset:mob/0380.haruclaire_v3/tick/event/ice_laser/turn execute if score @s AK.EventTimer matches 72..121 if predicate api:global_vars/difficulty/min/3_blessless at @s run function asset:mob/0380.haruclaire_v3/tick/event/ice_laser/turn # 地面に戻る - execute if score @s AK.EventTimer matches 155.. if block ~ ~-0.7 ~ #lib:no_collision positioned ^ ^-0.12 ^-0.02 run function asset:mob/0380.haruclaire_v3/tick/util/tp + execute if score @s AK.EventTimer matches 155.. if block ~ ~-0.7 ~ #lib:no_collision/ positioned ^ ^-0.12 ^-0.02 run function asset:mob/0380.haruclaire_v3/tick/util/tp # 終了 execute if score @s AK.EventTimer matches 171.. run function asset:mob/0380.haruclaire_v3/tick/event/ice_laser/end diff --git a/Asset/data/asset/functions/mob/0380.haruclaire_v3/tick/event/ice_siege/.mcfunction b/Asset/data/asset/functions/mob/0380.haruclaire_v3/tick/event/ice_siege/.mcfunction index a5ee05fb581..0d9905cd085 100644 --- a/Asset/data/asset/functions/mob/0380.haruclaire_v3/tick/event/ice_siege/.mcfunction +++ b/Asset/data/asset/functions/mob/0380.haruclaire_v3/tick/event/ice_siege/.mcfunction @@ -37,7 +37,7 @@ execute if score @s AK.EventTimer matches 58 at @e[type=area_effect_cloud,tag=AK.Temp.AttackPosition,distance=..80,sort=arbitrary,limit=1] run function asset:mob/0380.haruclaire_v3/tick/event/ice_siege/attack # 地面に戻る - execute if score @s AK.EventTimer matches 76.. if block ~ ~-0.7 ~ #lib:no_collision positioned ^ ^-0.08 ^ run function asset:mob/0380.haruclaire_v3/tick/util/tp + execute if score @s AK.EventTimer matches 76.. if block ~ ~-0.7 ~ #lib:no_collision/ positioned ^ ^-0.08 ^ run function asset:mob/0380.haruclaire_v3/tick/util/tp # 終了 execute if score @s AK.EventTimer matches 91.. run function asset:mob/0380.haruclaire_v3/tick/event/ice_siege/end diff --git a/Asset/data/asset/functions/mob/0380.haruclaire_v3/tick/event/ice_spear/.mcfunction b/Asset/data/asset/functions/mob/0380.haruclaire_v3/tick/event/ice_spear/.mcfunction index 6ebe775e556..85ca443c1c1 100644 --- a/Asset/data/asset/functions/mob/0380.haruclaire_v3/tick/event/ice_spear/.mcfunction +++ b/Asset/data/asset/functions/mob/0380.haruclaire_v3/tick/event/ice_spear/.mcfunction @@ -47,7 +47,7 @@ execute if score @s AK.EventTimer matches 125 at @e[type=area_effect_cloud,tag=AK.Temp.AttackPosition,tag=AK.IceSpear.Spread,distance=..80] run function asset:mob/0380.haruclaire_v3/tick/event/ice_spear/attack_spread # 地面に戻る - execute if score @s AK.EventTimer matches 136.. if block ~ ~-0.7 ~ #lib:no_collision positioned ^ ^-0.08 ^ run function asset:mob/0380.haruclaire_v3/tick/util/tp + execute if score @s AK.EventTimer matches 136.. if block ~ ~-0.7 ~ #lib:no_collision/ positioned ^ ^-0.08 ^ run function asset:mob/0380.haruclaire_v3/tick/util/tp # 終了 execute if score @s AK.EventTimer matches 161.. run function asset:mob/0380.haruclaire_v3/tick/event/ice_spear/end diff --git a/Asset/data/asset/functions/mob/0380.haruclaire_v3/tick/event/ice_wall/.mcfunction b/Asset/data/asset/functions/mob/0380.haruclaire_v3/tick/event/ice_wall/.mcfunction index bff49ced629..38dfb96c22f 100644 --- a/Asset/data/asset/functions/mob/0380.haruclaire_v3/tick/event/ice_wall/.mcfunction +++ b/Asset/data/asset/functions/mob/0380.haruclaire_v3/tick/event/ice_wall/.mcfunction @@ -32,7 +32,7 @@ execute if score @s AK.EventTimer matches 33 at @e[type=area_effect_cloud,tag=AK.Temp.AttackPosition,distance=..80,sort=random,limit=1] run function asset:mob/0380.haruclaire_v3/tick/event/ice_wall/attack # 地面に戻る - execute if score @s AK.EventTimer matches 76.. if block ~ ~-0.7 ~ #lib:no_collision positioned ^ ^-0.08 ^ run function asset:mob/0380.haruclaire_v3/tick/util/tp + execute if score @s AK.EventTimer matches 76.. if block ~ ~-0.7 ~ #lib:no_collision/ positioned ^ ^-0.08 ^ run function asset:mob/0380.haruclaire_v3/tick/util/tp # 終了 execute if score @s AK.EventTimer matches 91.. run function asset:mob/0380.haruclaire_v3/tick/event/ice_wall/end diff --git a/Asset/data/asset/functions/mob/0380.haruclaire_v3/tick/event/ice_wall_duo/.mcfunction b/Asset/data/asset/functions/mob/0380.haruclaire_v3/tick/event/ice_wall_duo/.mcfunction index de9286c9169..1e4cd9ee2b1 100644 --- a/Asset/data/asset/functions/mob/0380.haruclaire_v3/tick/event/ice_wall_duo/.mcfunction +++ b/Asset/data/asset/functions/mob/0380.haruclaire_v3/tick/event/ice_wall_duo/.mcfunction @@ -33,7 +33,7 @@ execute if score @s AK.EventTimer matches 36 at @e[type=area_effect_cloud,tag=AK.Temp.AttackPosition,distance=..80,sort=random,limit=2] run function asset:mob/0380.haruclaire_v3/tick/event/ice_wall_duo/attack # 地面に戻る - execute if score @s AK.EventTimer matches 55.. if block ~ ~-0.7 ~ #lib:no_collision positioned ^ ^-0.08 ^ run function asset:mob/0380.haruclaire_v3/tick/util/tp + execute if score @s AK.EventTimer matches 55.. if block ~ ~-0.7 ~ #lib:no_collision/ positioned ^ ^-0.08 ^ run function asset:mob/0380.haruclaire_v3/tick/util/tp # 終了 execute if score @s AK.EventTimer matches 75.. run function asset:mob/0380.haruclaire_v3/tick/event/ice_wall_duo/end diff --git a/Asset/data/asset/functions/mob/0380.haruclaire_v3/tick/event/icecremation_first/.mcfunction b/Asset/data/asset/functions/mob/0380.haruclaire_v3/tick/event/icecremation_first/.mcfunction index 84e9460d0ec..12448158aee 100644 --- a/Asset/data/asset/functions/mob/0380.haruclaire_v3/tick/event/icecremation_first/.mcfunction +++ b/Asset/data/asset/functions/mob/0380.haruclaire_v3/tick/event/icecremation_first/.mcfunction @@ -11,8 +11,8 @@ # アニメーション再生 execute if score @s AK.EventTimer matches 1 as @e[type=item_display,tag=AK.ModelRoot,distance=..80,sort=nearest,limit=1] run function asset:mob/0380.haruclaire_v3/tick/animated_java/play/26_0_second_ice_cremation_first # 地面に移動 - execute if score @s AK.EventTimer matches 1..80 unless block ~ ~-0.64 ~ #lib:no_collision positioned ^ ^0.05 ^ run function asset:mob/0380.haruclaire_v3/tick/util/tp - execute if score @s AK.EventTimer matches 1..80 if block ~ ~-0.7 ~ #lib:no_collision positioned ^ ^-0.05 ^ run function asset:mob/0380.haruclaire_v3/tick/util/tp + execute if score @s AK.EventTimer matches 1..80 unless block ~ ~-0.64 ~ #lib:no_collision/ positioned ^ ^0.05 ^ run function asset:mob/0380.haruclaire_v3/tick/util/tp + execute if score @s AK.EventTimer matches 1..80 if block ~ ~-0.7 ~ #lib:no_collision/ positioned ^ ^-0.05 ^ run function asset:mob/0380.haruclaire_v3/tick/util/tp # 攻撃 # 召喚 execute if score @s AK.EventTimer matches 139 at @s run function asset:mob/0380.haruclaire_v3/tick/event/icecremation_first/attack diff --git a/Asset/data/asset/functions/mob/0380.haruclaire_v3/tick/event/move/.mcfunction b/Asset/data/asset/functions/mob/0380.haruclaire_v3/tick/event/move/.mcfunction index 1db486b15c9..b7240b2e56e 100644 --- a/Asset/data/asset/functions/mob/0380.haruclaire_v3/tick/event/move/.mcfunction +++ b/Asset/data/asset/functions/mob/0380.haruclaire_v3/tick/event/move/.mcfunction @@ -17,7 +17,7 @@ # 移動 function asset:mob/0380.haruclaire_v3/tick/util/rotate_to_target execute if score @s AK.EventTimer matches ..192 at @s facing entity @p[tag=AK.MainTarget,distance=..80] feet positioned ^ ^ ^0.4 run function asset:mob/0380.haruclaire_v3/tick/util/tp - execute if score @s AK.EventTimer matches ..192 at @s unless block ~ ~-1 ~ #lib:no_collision positioned ~ ~0.05 ~ run function asset:mob/0380.haruclaire_v3/tick/util/tp + execute if score @s AK.EventTimer matches ..192 at @s unless block ~ ~-1 ~ #lib:no_collision/ positioned ~ ~0.05 ~ run function asset:mob/0380.haruclaire_v3/tick/util/tp # 十分近づくか、一定時間後に終了 execute if score @s AK.EventTimer matches ..192 if entity @p[tag=AK.MainTarget,distance=..5] run scoreboard players set @s AK.EventTimer 193 diff --git a/Asset/data/asset/functions/mob/0380.haruclaire_v3/tick/event/press/.mcfunction b/Asset/data/asset/functions/mob/0380.haruclaire_v3/tick/event/press/.mcfunction index d2e02e2f75f..94444c0834f 100644 --- a/Asset/data/asset/functions/mob/0380.haruclaire_v3/tick/event/press/.mcfunction +++ b/Asset/data/asset/functions/mob/0380.haruclaire_v3/tick/event/press/.mcfunction @@ -19,7 +19,7 @@ execute if score @s AK.EventTimer matches 90 positioned as @p[tag=AK.MainTarget,distance=..80] run function asset:mob/0380.haruclaire_v3/tick/event/press/set_position execute if score @s AK.EventTimer matches 90 run function asset:mob/0380.haruclaire_v3/tick/util/calc_vector.m {Tick:11} execute if score @s AK.EventTimer matches 95..105 run function asset:mob/0380.haruclaire_v3/tick/util/tp_using_vector - execute if score @s AK.EventTimer matches 106..182 at @s if block ~ ~-0.1 ~ #lib:no_collision positioned ^ ^-0.05 ^ run function asset:mob/0380.haruclaire_v3/tick/util/tp + execute if score @s AK.EventTimer matches 106..182 at @s if block ~ ~-0.1 ~ #lib:no_collision/ positioned ^ ^-0.05 ^ run function asset:mob/0380.haruclaire_v3/tick/util/tp execute if score @s AK.EventTimer matches 110..129 run function asset:mob/0380.haruclaire_v3/tick/util/rotate_to_target execute if score @s AK.EventTimer matches 129 positioned as @p[tag=AK.MainTarget,distance=..80] run function asset:mob/0380.haruclaire_v3/tick/event/press/set_position @@ -31,7 +31,7 @@ execute if score @s AK.EventTimer matches 167 run function asset:mob/0380.haruclaire_v3/tick/util/calc_vector.m {Tick:11} execute if score @s AK.EventTimer matches 172..182 run function asset:mob/0380.haruclaire_v3/tick/util/tp_using_vector - execute if score @s AK.EventTimer matches 225.. unless block ~ ~-0.75 ~ #lib:no_collision positioned ^ ^0.05 ^ run function asset:mob/0380.haruclaire_v3/tick/util/tp + execute if score @s AK.EventTimer matches 225.. unless block ~ ~-0.75 ~ #lib:no_collision/ positioned ^ ^0.05 ^ run function asset:mob/0380.haruclaire_v3/tick/util/tp # 攻撃 execute if score @s AK.EventTimer matches 114 run function asset:mob/0380.haruclaire_v3/tick/event/press/attack_0 diff --git a/Asset/data/asset/functions/mob/0380.haruclaire_v3/tick/event/punch/.mcfunction b/Asset/data/asset/functions/mob/0380.haruclaire_v3/tick/event/punch/.mcfunction index 6d1207f17d6..07f8424825a 100644 --- a/Asset/data/asset/functions/mob/0380.haruclaire_v3/tick/event/punch/.mcfunction +++ b/Asset/data/asset/functions/mob/0380.haruclaire_v3/tick/event/punch/.mcfunction @@ -36,7 +36,7 @@ execute if score @s AK.EventTimer matches 66 positioned ^ ^2 ^1 run function asset:mob/0380.haruclaire_v3/tick/event/punch/attack_throw # 地面に戻る - execute if score @s AK.EventTimer matches 144.. if block ~ ~-0.7 ~ #lib:no_collision positioned ^ ^-0.08 ^ run function asset:mob/0380.haruclaire_v3/tick/util/tp + execute if score @s AK.EventTimer matches 144.. if block ~ ~-0.7 ~ #lib:no_collision/ positioned ^ ^-0.08 ^ run function asset:mob/0380.haruclaire_v3/tick/util/tp # 終了 execute if score @s AK.EventTimer matches 156.. run function asset:mob/0380.haruclaire_v3/tick/event/punch/end diff --git a/Asset/data/asset/functions/mob/0380.haruclaire_v3/tick/event/super_ice_bullet/.mcfunction b/Asset/data/asset/functions/mob/0380.haruclaire_v3/tick/event/super_ice_bullet/.mcfunction index 0700ab501d4..f99d581cca0 100644 --- a/Asset/data/asset/functions/mob/0380.haruclaire_v3/tick/event/super_ice_bullet/.mcfunction +++ b/Asset/data/asset/functions/mob/0380.haruclaire_v3/tick/event/super_ice_bullet/.mcfunction @@ -22,8 +22,8 @@ execute if score @s AK.EventTimer matches 15 positioned ^ ^4 ^2 run function asset:mob/0380.haruclaire_v3/tick/event/super_ice_bullet/attack # 地面に戻る - execute if score @s AK.EventTimer matches 111..120 if block ~ ~-0.7 ~ #lib:no_collision positioned ^ ^-0.08 ^-0.02 run function asset:mob/0380.haruclaire_v3/tick/util/tp - execute if score @s AK.EventTimer matches 121..133 if block ~ ~-0.7 ~ #lib:no_collision positioned ^ ^-0.18 ^-0.02 run function asset:mob/0380.haruclaire_v3/tick/util/tp + execute if score @s AK.EventTimer matches 111..120 if block ~ ~-0.7 ~ #lib:no_collision/ positioned ^ ^-0.08 ^-0.02 run function asset:mob/0380.haruclaire_v3/tick/util/tp + execute if score @s AK.EventTimer matches 121..133 if block ~ ~-0.7 ~ #lib:no_collision/ positioned ^ ^-0.18 ^-0.02 run function asset:mob/0380.haruclaire_v3/tick/util/tp # 終了 execute if score @s AK.EventTimer matches 131.. run function asset:mob/0380.haruclaire_v3/tick/event/super_ice_bullet/end diff --git a/Asset/data/asset/functions/mob/0380.haruclaire_v3/tick/util/move_to_ground_loop.mcfunction b/Asset/data/asset/functions/mob/0380.haruclaire_v3/tick/util/move_to_ground_loop.mcfunction index 0f12c474054..67bbd2a8507 100644 --- a/Asset/data/asset/functions/mob/0380.haruclaire_v3/tick/util/move_to_ground_loop.mcfunction +++ b/Asset/data/asset/functions/mob/0380.haruclaire_v3/tick/util/move_to_ground_loop.mcfunction @@ -8,5 +8,5 @@ # 接地するまで繰り返す scoreboard players remove @s AK.Counter 1 - execute if score @s AK.Counter matches 1.. if block ~ ~-1 ~ #lib:no_collision positioned ~ ~-1 ~ run function asset:mob/0380.haruclaire_v3/tick/util/move_to_ground_loop - execute unless block ~ ~-1 ~ #lib:no_collision run tp @s ~ ~ ~ + execute if score @s AK.Counter matches 1.. if block ~ ~-1 ~ #lib:no_collision/ positioned ~ ~-1 ~ run function asset:mob/0380.haruclaire_v3/tick/util/move_to_ground_loop + execute unless block ~ ~-1 ~ #lib:no_collision/ run tp @s ~ ~ ~ diff --git a/Asset/data/asset/functions/mob/0380.haruclaire_v3/tick/util/move_to_roof_loop.mcfunction b/Asset/data/asset/functions/mob/0380.haruclaire_v3/tick/util/move_to_roof_loop.mcfunction index 1f19e75eca6..504a3421ccb 100644 --- a/Asset/data/asset/functions/mob/0380.haruclaire_v3/tick/util/move_to_roof_loop.mcfunction +++ b/Asset/data/asset/functions/mob/0380.haruclaire_v3/tick/util/move_to_roof_loop.mcfunction @@ -8,5 +8,5 @@ # 接地するまで繰り返す scoreboard players remove @s AK.Counter 1 - execute if score @s AK.Counter matches 1.. unless block ~ ~1 ~ #lib:no_collision positioned ~ ~1 ~ run function asset:mob/0380.haruclaire_v3/tick/util/move_to_roof_loop - execute if block ~ ~1 ~ #lib:no_collision run tp @s ~ ~ ~ + execute if score @s AK.Counter matches 1.. unless block ~ ~1 ~ #lib:no_collision/ positioned ~ ~1 ~ run function asset:mob/0380.haruclaire_v3/tick/util/move_to_roof_loop + execute if block ~ ~1 ~ #lib:no_collision/ run tp @s ~ ~ ~ diff --git a/Asset/data/asset/functions/mob/0380.haruclaire_v3/tick/util/setup_to_floor.mcfunction b/Asset/data/asset/functions/mob/0380.haruclaire_v3/tick/util/setup_to_floor.mcfunction index d700dfc395f..5d4da0866f1 100644 --- a/Asset/data/asset/functions/mob/0380.haruclaire_v3/tick/util/setup_to_floor.mcfunction +++ b/Asset/data/asset/functions/mob/0380.haruclaire_v3/tick/util/setup_to_floor.mcfunction @@ -6,7 +6,7 @@ # @within asset:object/2151.haruclaire_icewall_center/tick/ # 地中の場合、上に移動 - execute unless block ~ ~ ~ #lib:no_collision run return run function asset:mob/0380.haruclaire_v3/tick/util/move_to_roof + execute unless block ~ ~ ~ #lib:no_collision/ run return run function asset:mob/0380.haruclaire_v3/tick/util/move_to_roof # 空中の場合、下に移動 - execute if block ~ ~ ~ #lib:no_collision run return run function asset:mob/0380.haruclaire_v3/tick/util/move_to_ground + execute if block ~ ~ ~ #lib:no_collision/ run return run function asset:mob/0380.haruclaire_v3/tick/util/move_to_ground diff --git a/Asset/data/asset/functions/mob/0380.haruclaire_v3/tick/util/tp.mcfunction b/Asset/data/asset/functions/mob/0380.haruclaire_v3/tick/util/tp.mcfunction index 8145c5be91d..73aea8d7c1b 100644 --- a/Asset/data/asset/functions/mob/0380.haruclaire_v3/tick/util/tp.mcfunction +++ b/Asset/data/asset/functions/mob/0380.haruclaire_v3/tick/util/tp.mcfunction @@ -5,4 +5,4 @@ # @within asset:mob/0380.haruclaire_v3/tick/event/** # 対象の方を向く - execute if block ~ ~ ~ #lib:no_collision run tp @s ^ ^ ^ + execute if block ~ ~ ~ #lib:no_collision/ run tp @s ^ ^ ^ diff --git a/Asset/data/asset/functions/mob/0391.axia_first/ai/general/1.teleport.mcfunction b/Asset/data/asset/functions/mob/0391.axia_first/ai/general/1.teleport.mcfunction index deb03ded08c..953cab94fe3 100644 --- a/Asset/data/asset/functions/mob/0391.axia_first/ai/general/1.teleport.mcfunction +++ b/Asset/data/asset/functions/mob/0391.axia_first/ai/general/1.teleport.mcfunction @@ -5,4 +5,4 @@ # @within function asset:mob/0391.axia_first/** # 壁の中にはテレポートしない - execute if block ~ ~ ~ #lib:no_collision run tp @s ~ ~ ~ ~ ~ + execute if block ~ ~ ~ #lib:no_collision/ run tp @s ~ ~ ~ ~ ~ diff --git a/Asset/data/asset/functions/mob/0392.ecual_first/ai/animation/7_0_holy_ray/beam/loop.mcfunction b/Asset/data/asset/functions/mob/0392.ecual_first/ai/animation/7_0_holy_ray/beam/loop.mcfunction index 381a7830454..1f3cf523c9a 100644 --- a/Asset/data/asset/functions/mob/0392.ecual_first/ai/animation/7_0_holy_ray/beam/loop.mcfunction +++ b/Asset/data/asset/functions/mob/0392.ecual_first/ai/animation/7_0_holy_ray/beam/loop.mcfunction @@ -11,7 +11,7 @@ # 着弾検知 execute positioned ~-0.5 ~-0.5 ~-0.5 if entity @p[tag=!PlayerShouldInvulnerable,dx=0] run tag @s add AW.Landing - execute unless block ^ ^ ^0.5 #lib:no_collision run tag @s add AW.Landing + execute unless block ^ ^ ^0.5 #lib:no_collision/ run tag @s add AW.Landing # ターゲットにタグ付与 execute positioned ~-0.5 ~-0.5 ~-0.5 run tag @a[tag=!PlayerShouldInvulnerable,dx=0] add AW.Temp.Target diff --git a/Asset/data/asset/functions/mob/0392.ecual_first/ai/general/1.teleport.mcfunction b/Asset/data/asset/functions/mob/0392.ecual_first/ai/general/1.teleport.mcfunction index 48274e773ee..7aaa941c14c 100644 --- a/Asset/data/asset/functions/mob/0392.ecual_first/ai/general/1.teleport.mcfunction +++ b/Asset/data/asset/functions/mob/0392.ecual_first/ai/general/1.teleport.mcfunction @@ -5,4 +5,4 @@ # @within function asset:mob/0392.ecual_first/** # 壁の中にはテレポートしない - execute if block ~ ~ ~ #lib:no_collision run tp @s ~ ~ ~ ~ ~ + execute if block ~ ~ ~ #lib:no_collision/ run tp @s ~ ~ ~ ~ ~ diff --git a/Asset/data/asset/functions/mob/0393.labyria_first/ai/animation/2_0_sw_move_start/move/loop.mcfunction b/Asset/data/asset/functions/mob/0393.labyria_first/ai/animation/2_0_sw_move_start/move/loop.mcfunction index 98cd1934aeb..12f48170abb 100644 --- a/Asset/data/asset/functions/mob/0393.labyria_first/ai/animation/2_0_sw_move_start/move/loop.mcfunction +++ b/Asset/data/asset/functions/mob/0393.labyria_first/ai/animation/2_0_sw_move_start/move/loop.mcfunction @@ -20,4 +20,4 @@ execute as 0-0-0-0-0 at @s run function lib:spread_entity/ # そこがブロックで埋まってないか否かでループさせる - execute at 0-0-0-0-0 if block ~ ~ ~ #lib:no_collision if score $AX.Temp Temporary matches ..4 run function asset:mob/0393.labyria_first/ai/animation/2_0_sw_move_start/move/loop + execute at 0-0-0-0-0 if block ~ ~ ~ #lib:no_collision/ if score $AX.Temp Temporary matches ..4 run function asset:mob/0393.labyria_first/ai/animation/2_0_sw_move_start/move/loop diff --git a/Asset/data/asset/functions/mob/0393.labyria_first/ai/animation/3_0_ms_warp/gun_shot/loop.mcfunction b/Asset/data/asset/functions/mob/0393.labyria_first/ai/animation/3_0_ms_warp/gun_shot/loop.mcfunction index 7005ca87da1..50c627bbf8f 100644 --- a/Asset/data/asset/functions/mob/0393.labyria_first/ai/animation/3_0_ms_warp/gun_shot/loop.mcfunction +++ b/Asset/data/asset/functions/mob/0393.labyria_first/ai/animation/3_0_ms_warp/gun_shot/loop.mcfunction @@ -11,7 +11,7 @@ # 着弾検知 execute positioned ~-0.5 ~-0.5 ~-0.5 if entity @p[tag=!PlayerShouldInvulnerable,dx=0] run tag @s add AX.Landing - execute unless block ^ ^ ^0.5 #lib:no_collision run tag @s add AX.Landing + execute unless block ^ ^ ^0.5 #lib:no_collision/ run tag @s add AX.Landing # ターゲットにタグ付与 execute positioned ~-0.5 ~-0.5 ~-0.5 run tag @a[tag=!PlayerShouldInvulnerable,dx=0] add AX.Temp.Target diff --git a/Asset/data/asset/functions/mob/0393.labyria_first/ai/animation/3_0_ms_warp/warp/loop.mcfunction b/Asset/data/asset/functions/mob/0393.labyria_first/ai/animation/3_0_ms_warp/warp/loop.mcfunction index 846b6488000..93635e4bb79 100644 --- a/Asset/data/asset/functions/mob/0393.labyria_first/ai/animation/3_0_ms_warp/warp/loop.mcfunction +++ b/Asset/data/asset/functions/mob/0393.labyria_first/ai/animation/3_0_ms_warp/warp/loop.mcfunction @@ -26,7 +26,7 @@ execute as 0-0-0-0-0 at @s run function lib:spread_entity/ # 地面で埋まっていた場合、再拡散する - execute at 0-0-0-0-0 unless block ~ ~ ~ #lib:no_collision run scoreboard players set $AX.Temp Temporary 1 + execute at 0-0-0-0-0 unless block ~ ~ ~ #lib:no_collision/ run scoreboard players set $AX.Temp Temporary 1 # 条件を満たしていればワープする execute unless score $AX.Temp Temporary matches 1 at 0-0-0-0-0 run tp @s ~ ~ ~ ~ ~ diff --git a/Asset/data/asset/functions/mob/0393.labyria_first/ai/general/1.teleport.mcfunction b/Asset/data/asset/functions/mob/0393.labyria_first/ai/general/1.teleport.mcfunction index 42c63bfd039..f5df76490aa 100644 --- a/Asset/data/asset/functions/mob/0393.labyria_first/ai/general/1.teleport.mcfunction +++ b/Asset/data/asset/functions/mob/0393.labyria_first/ai/general/1.teleport.mcfunction @@ -5,4 +5,4 @@ # @within function asset:mob/0393.labyria_first/** # 壁の中にはテレポートしない - execute if block ~ ~ ~ #lib:no_collision run tp @s ~ ~ ~ ~ ~ + execute if block ~ ~ ~ #lib:no_collision/ run tp @s ~ ~ ~ ~ ~ diff --git a/Asset/data/asset/functions/mob/0399.void_spellbook/tick/.mcfunction b/Asset/data/asset/functions/mob/0399.void_spellbook/tick/.mcfunction index 60193554490..1ae2170ade7 100644 --- a/Asset/data/asset/functions/mob/0399.void_spellbook/tick/.mcfunction +++ b/Asset/data/asset/functions/mob/0399.void_spellbook/tick/.mcfunction @@ -8,12 +8,12 @@ particle enchant ~ ~1.68 ~ 0.25 0.25 0.25 0 2 force @a[distance=..40] # 接地で上を向く - execute unless block ~ ~-0.1 ~ #lib:no_collision at @s run tp @s ~ ~ ~ ~ ~-35 - execute unless block ~ ~1 ~ #lib:no_collision at @s run tp @s ~ ~ ~ ~ ~80 + execute unless block ~ ~-0.1 ~ #lib:no_collision/ at @s run tp @s ~ ~ ~ ~ ~-35 + execute unless block ~ ~1 ~ #lib:no_collision/ at @s run tp @s ~ ~ ~ ~ ~80 # カベにぶつかった際の処理 - execute at @s unless block ^ ^ ^0.5 #lib:no_collision run tp @s ~ ~ ~ ~45 ~-45 - execute at @s unless block ^ ^ ^0.2 #lib:no_collision run tp @s ~ ~ ~ ~45 ~-45 + execute at @s unless block ^ ^ ^0.5 #lib:no_collision/ run tp @s ~ ~ ~ ~45 ~-45 + execute at @s unless block ^ ^ ^0.2 #lib:no_collision/ run tp @s ~ ~ ~ ~45 ~-45 # 範囲内ならホーミングじみた移動 execute facing entity @p feet positioned ^ ^ ^-100 rotated as @s positioned ^ ^ ^-800 facing entity @s feet positioned as @s run tp @s ^ ^ ^0.025 ~ ~ diff --git a/Asset/data/asset/functions/mob/0400.explosion_spellbook/tick/.mcfunction b/Asset/data/asset/functions/mob/0400.explosion_spellbook/tick/.mcfunction index eccc9033408..854f42d3495 100644 --- a/Asset/data/asset/functions/mob/0400.explosion_spellbook/tick/.mcfunction +++ b/Asset/data/asset/functions/mob/0400.explosion_spellbook/tick/.mcfunction @@ -8,12 +8,12 @@ particle enchant ~ ~1.68 ~ 0.25 0.25 0.25 0 2 force @a[distance=..40] # 接地で上を向く - execute unless block ~ ~-0.1 ~ #lib:no_collision at @s run tp @s ~ ~ ~ ~ ~-35 - execute unless block ~ ~1 ~ #lib:no_collision at @s run tp @s ~ ~ ~ ~ ~80 + execute unless block ~ ~-0.1 ~ #lib:no_collision/ at @s run tp @s ~ ~ ~ ~ ~-35 + execute unless block ~ ~1 ~ #lib:no_collision/ at @s run tp @s ~ ~ ~ ~ ~80 # カベにぶつかった際の処理 - execute at @s unless block ^ ^ ^0.5 #lib:no_collision at @s run tp @s ~ ~ ~ ~45 ~-45 - execute at @s unless block ^ ^ ^0.2 #lib:no_collision at @s run tp @s ~ ~ ~ ~45 ~-45 + execute at @s unless block ^ ^ ^0.5 #lib:no_collision/ at @s run tp @s ~ ~ ~ ~45 ~-45 + execute at @s unless block ^ ^ ^0.2 #lib:no_collision/ at @s run tp @s ~ ~ ~ ~45 ~-45 # 範囲内ならホーミングじみた移動 execute facing entity @p feet positioned ^ ^ ^-100 rotated as @s positioned ^ ^ ^-800 facing entity @s feet positioned as @s run tp @s ^ ^ ^0.2 ~ ~ diff --git a/Asset/data/asset/functions/mob/0401.darkness_spellbook/tick/.mcfunction b/Asset/data/asset/functions/mob/0401.darkness_spellbook/tick/.mcfunction index 441232c75e5..f1535feac94 100644 --- a/Asset/data/asset/functions/mob/0401.darkness_spellbook/tick/.mcfunction +++ b/Asset/data/asset/functions/mob/0401.darkness_spellbook/tick/.mcfunction @@ -8,12 +8,12 @@ particle enchant ~ ~1.68 ~ 0.25 0.25 0.25 0 2 force @a[distance=..40] # 接地で上を向く - execute unless block ~ ~-0.1 ~ #lib:no_collision at @s run tp @s ~ ~ ~ ~ ~-35 - execute unless block ~ ~1 ~ #lib:no_collision at @s run tp @s ~ ~ ~ ~ ~80 + execute unless block ~ ~-0.1 ~ #lib:no_collision/ at @s run tp @s ~ ~ ~ ~ ~-35 + execute unless block ~ ~1 ~ #lib:no_collision/ at @s run tp @s ~ ~ ~ ~ ~80 # カベにぶつかった際の処理 - execute at @s unless block ^ ^ ^0.5 #lib:no_collision at @s run tp @s ~ ~ ~ ~45 ~-45 - execute at @s unless block ^ ^ ^0.2 #lib:no_collision at @s run tp @s ~ ~ ~ ~45 ~-45 + execute at @s unless block ^ ^ ^0.5 #lib:no_collision/ at @s run tp @s ~ ~ ~ ~45 ~-45 + execute at @s unless block ^ ^ ^0.2 #lib:no_collision/ at @s run tp @s ~ ~ ~ ~45 ~-45 # 範囲内ならホーミングじみた移動 execute facing entity @p feet positioned ^ ^ ^-100 rotated as @s positioned ^ ^ ^-800 facing entity @s feet positioned as @s run tp @s ^ ^ ^0.2 ~ ~ diff --git a/Asset/data/asset/functions/mob/0401.darkness_spellbook/tick/teleport.mcfunction b/Asset/data/asset/functions/mob/0401.darkness_spellbook/tick/teleport.mcfunction index 013e946b7a8..5fb7880ebff 100644 --- a/Asset/data/asset/functions/mob/0401.darkness_spellbook/tick/teleport.mcfunction +++ b/Asset/data/asset/functions/mob/0401.darkness_spellbook/tick/teleport.mcfunction @@ -15,7 +15,7 @@ execute as 0-0-0-0-0 at @s run function lib:spread_entity/ # マーカーの位置にブロックがなかったらテレポートする - execute at 0-0-0-0-0 if block ~ ~ ~ #lib:no_collision run tp @s ~ ~ ~ + execute at 0-0-0-0-0 if block ~ ~ ~ #lib:no_collision/ run tp @s ~ ~ ~ # マーカーを戻してあげる execute in overworld run tp 0-0-0-0-0 0.0 0.0 0.0 diff --git a/Asset/data/asset/functions/mob/0402.drown_spellbook/tick/.mcfunction b/Asset/data/asset/functions/mob/0402.drown_spellbook/tick/.mcfunction index 4f253b31c20..7c8838ea177 100644 --- a/Asset/data/asset/functions/mob/0402.drown_spellbook/tick/.mcfunction +++ b/Asset/data/asset/functions/mob/0402.drown_spellbook/tick/.mcfunction @@ -8,12 +8,12 @@ particle enchant ~ ~1.68 ~ 0.25 0.25 0.25 0 2 force @a[distance=..40] # 接地で上を向く - execute unless block ~ ~-0.1 ~ #lib:no_collision at @s run tp @s ~ ~ ~ ~ ~-35 - execute unless block ~ ~1 ~ #lib:no_collision at @s run tp @s ~ ~ ~ ~ ~80 + execute unless block ~ ~-0.1 ~ #lib:no_collision/ at @s run tp @s ~ ~ ~ ~ ~-35 + execute unless block ~ ~1 ~ #lib:no_collision/ at @s run tp @s ~ ~ ~ ~ ~80 # カベにぶつかった際の処理 - execute at @s unless block ^ ^ ^0.5 #lib:no_collision at @s run tp @s ~ ~ ~ ~45 ~-45 - execute at @s unless block ^ ^ ^0.2 #lib:no_collision at @s run tp @s ~ ~ ~ ~45 ~-45 + execute at @s unless block ^ ^ ^0.5 #lib:no_collision/ at @s run tp @s ~ ~ ~ ~45 ~-45 + execute at @s unless block ^ ^ ^0.2 #lib:no_collision/ at @s run tp @s ~ ~ ~ ~45 ~-45 # 範囲内ならホーミングじみた移動 execute facing entity @p feet positioned ^ ^ ^-100 rotated as @s positioned ^ ^ ^-800 facing entity @s feet positioned as @s run tp @s ^ ^ ^0.2 ~ ~ diff --git a/Asset/data/asset/functions/mob/0402.drown_spellbook/tick/teleport.mcfunction b/Asset/data/asset/functions/mob/0402.drown_spellbook/tick/teleport.mcfunction index 96b9332cf69..4771297ddac 100644 --- a/Asset/data/asset/functions/mob/0402.drown_spellbook/tick/teleport.mcfunction +++ b/Asset/data/asset/functions/mob/0402.drown_spellbook/tick/teleport.mcfunction @@ -15,7 +15,7 @@ execute as 0-0-0-0-0 at @s run function lib:spread_entity/ # マーカーの位置にブロックがなかったらテレポートする - execute at 0-0-0-0-0 if block ~ ~ ~ #lib:no_collision run tp @s ~ ~ ~ + execute at 0-0-0-0-0 if block ~ ~ ~ #lib:no_collision/ run tp @s ~ ~ ~ # マーカーを戻してあげる execute in overworld run tp 0-0-0-0-0 0.0 0.0 0.0 diff --git a/Asset/data/asset/functions/mob/0410.heiloang/tick/event/plamet/attack_pursuit.mcfunction b/Asset/data/asset/functions/mob/0410.heiloang/tick/event/plamet/attack_pursuit.mcfunction index f59a80f34d3..3a7c3cf6485 100644 --- a/Asset/data/asset/functions/mob/0410.heiloang/tick/event/plamet/attack_pursuit.mcfunction +++ b/Asset/data/asset/functions/mob/0410.heiloang/tick/event/plamet/attack_pursuit.mcfunction @@ -5,7 +5,7 @@ # @within asset:mob/0410.heiloang/tick/event/plamet/ # 地面が無ければ消す - execute if block ~ ~-1 ~ #lib:no_collision run return run kill @e[type=area_effect_cloud,tag=BE.Temp.Plamet.SummonPosition,sort=arbitrary,limit=1] + execute if block ~ ~-1 ~ #lib:no_collision/ run return run kill @e[type=area_effect_cloud,tag=BE.Temp.Plamet.SummonPosition,sort=arbitrary,limit=1] # 弾召喚 data modify storage api: Argument.ID set value 2129 diff --git a/Asset/data/asset/functions/mob/0410.heiloang/tick/util/move_to_ground_loop.mcfunction b/Asset/data/asset/functions/mob/0410.heiloang/tick/util/move_to_ground_loop.mcfunction index 1d65ddcbfbe..b91d3c3b479 100644 --- a/Asset/data/asset/functions/mob/0410.heiloang/tick/util/move_to_ground_loop.mcfunction +++ b/Asset/data/asset/functions/mob/0410.heiloang/tick/util/move_to_ground_loop.mcfunction @@ -7,5 +7,5 @@ # 接地するまで繰り返す scoreboard players remove @s BE.Counter 1 - execute if score @s BE.Counter matches 1.. if block ~ ~-1 ~ #lib:no_collision positioned ~ ~-1 ~ run function asset:mob/0410.heiloang/tick/util/move_to_ground_loop - execute unless block ~ ~-1 ~ #lib:no_collision run tp @s ~ ~ ~ + execute if score @s BE.Counter matches 1.. if block ~ ~-1 ~ #lib:no_collision/ positioned ~ ~-1 ~ run function asset:mob/0410.heiloang/tick/util/move_to_ground_loop + execute unless block ~ ~-1 ~ #lib:no_collision/ run tp @s ~ ~ ~ diff --git a/Asset/data/asset/functions/mob/0411.behemoth/tick/event/flatten/.mcfunction b/Asset/data/asset/functions/mob/0411.behemoth/tick/event/flatten/.mcfunction index dc135a7badc..9e7e46a4161 100644 --- a/Asset/data/asset/functions/mob/0411.behemoth/tick/event/flatten/.mcfunction +++ b/Asset/data/asset/functions/mob/0411.behemoth/tick/event/flatten/.mcfunction @@ -20,7 +20,7 @@ # ターゲットを向く execute if score @s BF.EventTimer matches 100..104 run function asset:mob/0411.behemoth/tick/util/rotate_to_target # 移動 - execute if score @s BF.EventTimer matches 100..115 if block ~ ~-0.1 ~ #lib:no_collision run tp @s ~ ~-0.1 ~ + execute if score @s BF.EventTimer matches 100..115 if block ~ ~-0.1 ~ #lib:no_collision/ run tp @s ~ ~-0.1 ~ execute if score @s BF.EventTimer matches 100..105 at @s run tp @s ^ ^ ^0.2 execute if score @s BF.EventTimer matches 106..110 at @s run tp @s ^ ^ ^0.4 execute if score @s BF.EventTimer matches 131..140 run tp @s ~ ~0.05 ~ diff --git a/Asset/data/asset/functions/mob/0411.behemoth/tick/event/terzetto_succession_dive/.mcfunction b/Asset/data/asset/functions/mob/0411.behemoth/tick/event/terzetto_succession_dive/.mcfunction index 804a37d4bb1..2adb1b7c272 100644 --- a/Asset/data/asset/functions/mob/0411.behemoth/tick/event/terzetto_succession_dive/.mcfunction +++ b/Asset/data/asset/functions/mob/0411.behemoth/tick/event/terzetto_succession_dive/.mcfunction @@ -47,7 +47,7 @@ # ターゲットを向く execute if score @s BF.EventTimer matches 220..235 run function asset:mob/0411.behemoth/tick/util/rotate_to_target # 移動 - execute if score @s BF.EventTimer matches 220..235 if block ~ ~-0.1 ~ #lib:no_collision run tp @s ~ ~-0.1 ~ + execute if score @s BF.EventTimer matches 220..235 if block ~ ~-0.1 ~ #lib:no_collision/ run tp @s ~ ~-0.1 ~ execute if score @s BF.EventTimer matches 220..225 at @s run tp @s ^ ^ ^0.2 execute if score @s BF.EventTimer matches 226..230 at @s run tp @s ^ ^ ^0.4 execute if score @s BF.EventTimer matches 251..260 run tp @s ~ ~0.05 ~ diff --git a/Asset/data/asset/functions/mob/0411.behemoth/tick/util/move_to_ground_loop.mcfunction b/Asset/data/asset/functions/mob/0411.behemoth/tick/util/move_to_ground_loop.mcfunction index 38ddb9da934..81ba6c7c3c3 100644 --- a/Asset/data/asset/functions/mob/0411.behemoth/tick/util/move_to_ground_loop.mcfunction +++ b/Asset/data/asset/functions/mob/0411.behemoth/tick/util/move_to_ground_loop.mcfunction @@ -7,5 +7,5 @@ # 接地するまで繰り返す scoreboard players remove @s BF.Counter 1 - execute if score @s BF.Counter matches 1.. if block ~ ~-1 ~ #lib:no_collision positioned ~ ~-1 ~ run function asset:mob/0411.behemoth/tick/util/move_to_ground_loop - execute unless block ~ ~-1 ~ #lib:no_collision run tp @s ~ ~ ~ + execute if score @s BF.Counter matches 1.. if block ~ ~-1 ~ #lib:no_collision/ positioned ~ ~-1 ~ run function asset:mob/0411.behemoth/tick/util/move_to_ground_loop + execute unless block ~ ~-1 ~ #lib:no_collision/ run tp @s ~ ~ ~ diff --git a/Asset/data/asset/functions/mob/0412.tiamat/tick/event/hellwing/effect.mcfunction b/Asset/data/asset/functions/mob/0412.tiamat/tick/event/hellwing/effect.mcfunction index 7d4d88dfbae..d28b54afa1d 100644 --- a/Asset/data/asset/functions/mob/0412.tiamat/tick/event/hellwing/effect.mcfunction +++ b/Asset/data/asset/functions/mob/0412.tiamat/tick/event/hellwing/effect.mcfunction @@ -7,7 +7,7 @@ # function asset:mob/0412.tiamat/tick/event/terzetto_succession_dive/ # 地面が無ければ消す - execute if block ~ ~ ~ #lib:no_collision run return run kill @s + execute if block ~ ~ ~ #lib:no_collision/ run return run kill @s # 演出 particle cloud ~ ~1 ~ 2 2 2 0.1 6 diff --git a/Asset/data/asset/functions/mob/0412.tiamat/tick/event/terzetto_ragnarok/summon_attack_pos_icicle.mcfunction b/Asset/data/asset/functions/mob/0412.tiamat/tick/event/terzetto_ragnarok/summon_attack_pos_icicle.mcfunction index bcf00ff034a..b5ee5dcfe9a 100644 --- a/Asset/data/asset/functions/mob/0412.tiamat/tick/event/terzetto_ragnarok/summon_attack_pos_icicle.mcfunction +++ b/Asset/data/asset/functions/mob/0412.tiamat/tick/event/terzetto_ragnarok/summon_attack_pos_icicle.mcfunction @@ -48,4 +48,4 @@ summon area_effect_cloud ^-0.6 ^ ^32.49556 {Duration:105,Tags:["BG.Temp.AttackPo summon area_effect_cloud ^11.4 ^ ^30.89556 {Duration:105,Tags:["BG.Temp.AttackPosition"]} # 地面が無ければ消す - execute as @e[type=area_effect_cloud,tag=BG.Temp.AttackPosition] at @s if block ~ ~-1 ~ #lib:no_collision run kill @s + execute as @e[type=area_effect_cloud,tag=BG.Temp.AttackPosition] at @s if block ~ ~-1 ~ #lib:no_collision/ run kill @s diff --git a/Asset/data/asset/functions/mob/0412.tiamat/tick/util/move_to_ground_loop.mcfunction b/Asset/data/asset/functions/mob/0412.tiamat/tick/util/move_to_ground_loop.mcfunction index 104f0e8fce3..c7f030ba28d 100644 --- a/Asset/data/asset/functions/mob/0412.tiamat/tick/util/move_to_ground_loop.mcfunction +++ b/Asset/data/asset/functions/mob/0412.tiamat/tick/util/move_to_ground_loop.mcfunction @@ -7,5 +7,5 @@ # 接地するまで繰り返す scoreboard players remove @s BG.Counter 1 - execute if score @s BG.Counter matches 1.. if block ~ ~-1 ~ #lib:no_collision positioned ~ ~-1 ~ run function asset:mob/0412.tiamat/tick/util/move_to_ground_loop - execute unless block ~ ~-1 ~ #lib:no_collision run tp @s ~ ~ ~ + execute if score @s BG.Counter matches 1.. if block ~ ~-1 ~ #lib:no_collision/ positioned ~ ~-1 ~ run function asset:mob/0412.tiamat/tick/util/move_to_ground_loop + execute unless block ~ ~-1 ~ #lib:no_collision/ run tp @s ~ ~ ~ diff --git a/Asset/data/asset/functions/mob/0416.ahssat/tick/summon/spread.mcfunction b/Asset/data/asset/functions/mob/0416.ahssat/tick/summon/spread.mcfunction index c21b77c992f..a07129fbca0 100644 --- a/Asset/data/asset/functions/mob/0416.ahssat/tick/summon/spread.mcfunction +++ b/Asset/data/asset/functions/mob/0416.ahssat/tick/summon/spread.mcfunction @@ -16,7 +16,7 @@ execute as @e[type=marker,tag=BK.Marker,distance=..30] at @s run function lib:spread_entity/ # 配置 - execute at @e[type=marker,tag=BK.Marker,distance=..30] if block ~ ~ ~ #lib:no_collision run function asset:mob/0416.ahssat/tick/summon/summon + execute at @e[type=marker,tag=BK.Marker,distance=..30] if block ~ ~ ~ #lib:no_collision/ run function asset:mob/0416.ahssat/tick/summon/summon # マーカーを戻してあげる kill @e[type=marker,tag=BK.Marker,distance=..30] diff --git a/Asset/data/asset/functions/mob/0437.lawless_iron_doll/tick/.mcfunction b/Asset/data/asset/functions/mob/0437.lawless_iron_doll/tick/.mcfunction index 7037f444fd9..8878e85b91b 100644 --- a/Asset/data/asset/functions/mob/0437.lawless_iron_doll/tick/.mcfunction +++ b/Asset/data/asset/functions/mob/0437.lawless_iron_doll/tick/.mcfunction @@ -14,13 +14,13 @@ execute at @s run function asset:mob/0437.lawless_iron_doll/tick/model_operate # 足元が埋まっていて、上にブロックがないなら上に移動 - execute unless block ~ ~ ~ #lib:no_collision if block ~ ~2.5 ~ #lib:no_collision run tp @s ~ ~0.1 ~ + execute unless block ~ ~ ~ #lib:no_collision/ if block ~ ~2.5 ~ #lib:no_collision/ run tp @s ~ ~0.1 ~ # 頭上にブロックがあって、下にブロックがないなら下に移動 - execute unless block ~ ~2.5 ~ #lib:no_collision if block ~ ~-1 ~ #lib:no_collision run tp @s ~ ~-0.1 ~ + execute unless block ~ ~2.5 ~ #lib:no_collision/ if block ~ ~-1 ~ #lib:no_collision/ run tp @s ~ ~-0.1 ~ # 空中歩行に説得力もたせるパーティクル。ただし一部の動作のときはやらない。 - execute if entity @s[tag=!C5.Skill.SuperSlam,tag=!C5.Skill.Charge] if block ~ ~-0.25 ~ #lib:no_collision run particle minecraft:enchant ~ ~ ~ 0.7 0 0.7 0 30 force @a[distance=..32] + execute if entity @s[tag=!C5.Skill.SuperSlam,tag=!C5.Skill.Charge] if block ~ ~-0.25 ~ #lib:no_collision/ run particle minecraft:enchant ~ ~ ~ 0.7 0 0.7 0 30 force @a[distance=..32] # 動作 # イントロ diff --git a/Asset/data/asset/functions/mob/0437.lawless_iron_doll/tick/base_move/skill/breathing_walk/walk_tick.mcfunction b/Asset/data/asset/functions/mob/0437.lawless_iron_doll/tick/base_move/skill/breathing_walk/walk_tick.mcfunction index 843fba0ad6f..52b8214a732 100644 --- a/Asset/data/asset/functions/mob/0437.lawless_iron_doll/tick/base_move/skill/breathing_walk/walk_tick.mcfunction +++ b/Asset/data/asset/functions/mob/0437.lawless_iron_doll/tick/base_move/skill/breathing_walk/walk_tick.mcfunction @@ -17,11 +17,11 @@ # 6tickごとに足音 scoreboard players operation $Interval Temporary %= $20 Const # 下に何かあるなら、ゴツンゴツン - execute if score $Interval Temporary matches 0 unless block ~ ~-0.25 ~ #lib:no_collision run playsound minecraft:entity.iron_golem.step hostile @a ~ ~ ~ 2.5 0.5 - execute if score $Interval Temporary matches 0 unless block ~ ~-0.25 ~ #lib:no_collision run playsound minecraft:entity.iron_golem.step hostile @a ~ ~ ~ 2.5 0.6 + execute if score $Interval Temporary matches 0 unless block ~ ~-0.25 ~ #lib:no_collision/ run playsound minecraft:entity.iron_golem.step hostile @a ~ ~ ~ 2.5 0.5 + execute if score $Interval Temporary matches 0 unless block ~ ~-0.25 ~ #lib:no_collision/ run playsound minecraft:entity.iron_golem.step hostile @a ~ ~ ~ 2.5 0.6 # 下に何もないなら、キラキラ - execute if score $Interval Temporary matches 0 if block ~ ~-0.25 ~ #lib:no_collision run playsound minecraft:block.amethyst_block.place hostile @a ~ ~ ~ 2 0.5 - execute if score $Interval Temporary matches 0 if block ~ ~-0.25 ~ #lib:no_collision run playsound minecraft:block.amethyst_block.chime hostile @a ~ ~ ~ 2 1 + execute if score $Interval Temporary matches 0 if block ~ ~-0.25 ~ #lib:no_collision/ run playsound minecraft:block.amethyst_block.place hostile @a ~ ~ ~ 2 0.5 + execute if score $Interval Temporary matches 0 if block ~ ~-0.25 ~ #lib:no_collision/ run playsound minecraft:block.amethyst_block.chime hostile @a ~ ~ ~ 2 1 # リセット scoreboard players reset $Interval Temporary @@ -29,7 +29,7 @@ function asset:mob/0437.lawless_iron_doll/tick/base_move/common/descend_when_all_player_below # 足元が埋まっていて、上にブロックがないなら上に移動 - execute unless block ^ ^ ^1 #lib:no_collision run tp @s ~ ~0.1 ~ + execute unless block ^ ^ ^1 #lib:no_collision/ run tp @s ~ ~0.1 ~ # まっすぐ前に歩く execute at @s run tp @s ^ ^ ^0.1 ~ 0 diff --git a/Asset/data/asset/functions/mob/0437.lawless_iron_doll/tick/base_move/skill/charge/charge_tick.mcfunction b/Asset/data/asset/functions/mob/0437.lawless_iron_doll/tick/base_move/skill/charge/charge_tick.mcfunction index 323099d6c45..973b262fcbd 100644 --- a/Asset/data/asset/functions/mob/0437.lawless_iron_doll/tick/base_move/skill/charge/charge_tick.mcfunction +++ b/Asset/data/asset/functions/mob/0437.lawless_iron_doll/tick/base_move/skill/charge/charge_tick.mcfunction @@ -37,22 +37,22 @@ # 6tickごとに足音 scoreboard players operation $Interval Temporary %= $6 Const # 下に何かあるなら、ゴツンゴツン - execute if score $Interval Temporary matches 0 unless block ~ ~-0.25 ~ #lib:no_collision run playsound minecraft:entity.iron_golem.step hostile @a ~ ~ ~ 2.5 0.5 - execute if score $Interval Temporary matches 0 unless block ~ ~-0.25 ~ #lib:no_collision run playsound minecraft:entity.iron_golem.step hostile @a ~ ~ ~ 2.5 0.6 + execute if score $Interval Temporary matches 0 unless block ~ ~-0.25 ~ #lib:no_collision/ run playsound minecraft:entity.iron_golem.step hostile @a ~ ~ ~ 2.5 0.5 + execute if score $Interval Temporary matches 0 unless block ~ ~-0.25 ~ #lib:no_collision/ run playsound minecraft:entity.iron_golem.step hostile @a ~ ~ ~ 2.5 0.6 # 下に何もないなら、キラキラ - execute if score $Interval Temporary matches 0 if block ~ ~-0.25 ~ #lib:no_collision run playsound minecraft:block.amethyst_block.place hostile @a ~ ~ ~ 2 0.5 - execute if score $Interval Temporary matches 0 if block ~ ~-0.25 ~ #lib:no_collision run playsound minecraft:block.amethyst_block.chime hostile @a ~ ~ ~ 2 1 + execute if score $Interval Temporary matches 0 if block ~ ~-0.25 ~ #lib:no_collision/ run playsound minecraft:block.amethyst_block.place hostile @a ~ ~ ~ 2 0.5 + execute if score $Interval Temporary matches 0 if block ~ ~-0.25 ~ #lib:no_collision/ run playsound minecraft:block.amethyst_block.chime hostile @a ~ ~ ~ 2 1 # リセット scoreboard players reset $Interval Temporary # 空中歩行に説得力もたせるパーティクル - execute if block ~ ~-0.25 ~ #lib:no_collision run particle minecraft:enchant ~ ~ ~ 0.7 0 0.7 0 30 force @a[distance=..32] + execute if block ~ ~-0.25 ~ #lib:no_collision/ run particle minecraft:enchant ~ ~ ~ 0.7 0 0.7 0 30 force @a[distance=..32] # そこらのプレイヤーより上にいる場合、下にTP。下にブロックがあったら止まるよ。 function asset:mob/0437.lawless_iron_doll/tick/base_move/common/descend_when_all_player_below # 足元の先が埋まっているなら、上に移動 - execute rotated ~ 0 unless block ^ ^ ^1 #lib:no_collision run tp @s ~ ~0.1 ~ + execute rotated ~ 0 unless block ^ ^ ^1 #lib:no_collision/ run tp @s ~ ~0.1 ~ # まっすぐ前に歩く execute at @s run tp @s ^ ^ ^1 ~ 0 diff --git a/Asset/data/asset/functions/mob/0437.lawless_iron_doll/tick/base_move/skill/chaser_shot/summon/marker.mcfunction b/Asset/data/asset/functions/mob/0437.lawless_iron_doll/tick/base_move/skill/chaser_shot/summon/marker.mcfunction index f524422fd0e..d41c34e6884 100644 --- a/Asset/data/asset/functions/mob/0437.lawless_iron_doll/tick/base_move/skill/chaser_shot/summon/marker.mcfunction +++ b/Asset/data/asset/functions/mob/0437.lawless_iron_doll/tick/base_move/skill/chaser_shot/summon/marker.mcfunction @@ -16,7 +16,7 @@ execute as @e[type=marker,tag=SpreadMarker,limit=1] at @r[gamemode=!spectator,distance=..256] run function lib:spread_entity/ # その座標にブロックがなければマーカーを置く - execute at @e[type=marker,tag=SpreadMarker,limit=1] if block ~ ~ ~ #lib:no_collision run summon marker ~ ~ ~ {Tags:["C5.Marker","C5.Marker.SummonPoint"]} + execute at @e[type=marker,tag=SpreadMarker,limit=1] if block ~ ~ ~ #lib:no_collision/ run summon marker ~ ~ ~ {Tags:["C5.Marker","C5.Marker.SummonPoint"]} # リセット kill @e[type=marker,tag=SpreadMarker,limit=1] diff --git a/Asset/data/asset/functions/mob/0437.lawless_iron_doll/tick/base_move/skill/lingering_laser/laser/recursive.mcfunction b/Asset/data/asset/functions/mob/0437.lawless_iron_doll/tick/base_move/skill/lingering_laser/laser/recursive.mcfunction index bc4ca3e5d17..7012016abfd 100644 --- a/Asset/data/asset/functions/mob/0437.lawless_iron_doll/tick/base_move/skill/lingering_laser/laser/recursive.mcfunction +++ b/Asset/data/asset/functions/mob/0437.lawless_iron_doll/tick/base_move/skill/lingering_laser/laser/recursive.mcfunction @@ -13,4 +13,4 @@ scoreboard players add @s Temporary 1 # 壁がなかったり、プレイヤーにあたったりしなければ再帰 - execute if entity @s[distance=..30] positioned ~-0.5 ~-0.5 ~-0.5 unless entity @a[tag=!PlayerShouldInvulnerable,dx=0] positioned ~0.5 ~0.5 ~0.5 positioned ^ ^ ^1 if block ~ ~ ~ #lib:no_collision run function asset:mob/0437.lawless_iron_doll/tick/base_move/skill/lingering_laser/laser/recursive + execute if entity @s[distance=..30] positioned ~-0.5 ~-0.5 ~-0.5 unless entity @a[tag=!PlayerShouldInvulnerable,dx=0] positioned ~0.5 ~0.5 ~0.5 positioned ^ ^ ^1 if block ~ ~ ~ #lib:no_collision/ run function asset:mob/0437.lawless_iron_doll/tick/base_move/skill/lingering_laser/laser/recursive diff --git a/Asset/data/asset/functions/mob/0437.lawless_iron_doll/tick/base_move/skill/super_laser/alert_laser/recursive.mcfunction b/Asset/data/asset/functions/mob/0437.lawless_iron_doll/tick/base_move/skill/super_laser/alert_laser/recursive.mcfunction index 652d8139d3f..2527783163c 100644 --- a/Asset/data/asset/functions/mob/0437.lawless_iron_doll/tick/base_move/skill/super_laser/alert_laser/recursive.mcfunction +++ b/Asset/data/asset/functions/mob/0437.lawless_iron_doll/tick/base_move/skill/super_laser/alert_laser/recursive.mcfunction @@ -13,4 +13,4 @@ scoreboard players add @s Temporary 1 # 壁がなかったり、プレイヤーにあたったりしなければ再帰 - execute if entity @s[distance=..30] positioned ~-0.5 ~-0.5 ~-0.5 unless entity @a[tag=!PlayerShouldInvulnerable,dx=0] positioned ~0.5 ~0.5 ~0.5 positioned ^ ^ ^1 if block ~ ~ ~ #lib:no_collision run function asset:mob/0437.lawless_iron_doll/tick/base_move/skill/super_laser/alert_laser/recursive + execute if entity @s[distance=..30] positioned ~-0.5 ~-0.5 ~-0.5 unless entity @a[tag=!PlayerShouldInvulnerable,dx=0] positioned ~0.5 ~0.5 ~0.5 positioned ^ ^ ^1 if block ~ ~ ~ #lib:no_collision/ run function asset:mob/0437.lawless_iron_doll/tick/base_move/skill/super_laser/alert_laser/recursive diff --git a/Asset/data/asset/functions/mob/0437.lawless_iron_doll/tick/base_move/skill/super_laser/big_laser/recursive.mcfunction b/Asset/data/asset/functions/mob/0437.lawless_iron_doll/tick/base_move/skill/super_laser/big_laser/recursive.mcfunction index 3d27b7c18c8..91ea3a31d76 100644 --- a/Asset/data/asset/functions/mob/0437.lawless_iron_doll/tick/base_move/skill/super_laser/big_laser/recursive.mcfunction +++ b/Asset/data/asset/functions/mob/0437.lawless_iron_doll/tick/base_move/skill/super_laser/big_laser/recursive.mcfunction @@ -13,4 +13,4 @@ scoreboard players add @s Temporary 1 # 壁がなかったり、プレイヤーにあたったりしなければ再帰 - execute if entity @s[distance=..30] positioned ~-0.5 ~-0.5 ~-0.5 unless entity @a[tag=!PlayerShouldInvulnerable,dx=0] positioned ~0.5 ~0.5 ~0.5 positioned ^ ^ ^1 if block ~ ~ ~ #lib:no_collision run function asset:mob/0437.lawless_iron_doll/tick/base_move/skill/super_laser/big_laser/recursive + execute if entity @s[distance=..30] positioned ~-0.5 ~-0.5 ~-0.5 unless entity @a[tag=!PlayerShouldInvulnerable,dx=0] positioned ~0.5 ~0.5 ~0.5 positioned ^ ^ ^1 if block ~ ~ ~ #lib:no_collision/ run function asset:mob/0437.lawless_iron_doll/tick/base_move/skill/super_laser/big_laser/recursive diff --git a/Asset/data/asset/functions/mob/0437.lawless_iron_doll/tick/base_move/skill/super_laser/small_laser/recursive.mcfunction b/Asset/data/asset/functions/mob/0437.lawless_iron_doll/tick/base_move/skill/super_laser/small_laser/recursive.mcfunction index cf3010937a6..d7295ab1ed1 100644 --- a/Asset/data/asset/functions/mob/0437.lawless_iron_doll/tick/base_move/skill/super_laser/small_laser/recursive.mcfunction +++ b/Asset/data/asset/functions/mob/0437.lawless_iron_doll/tick/base_move/skill/super_laser/small_laser/recursive.mcfunction @@ -13,4 +13,4 @@ scoreboard players add @s Temporary 1 # 壁がなかったり、プレイヤーにあたったりしなければ再帰 - execute if entity @s[distance=..30] positioned ~-0.5 ~-0.5 ~-0.5 unless entity @a[tag=!PlayerShouldInvulnerable,dx=0] positioned ~0.5 ~0.5 ~0.5 positioned ^ ^ ^1 if block ~ ~ ~ #lib:no_collision run function asset:mob/0437.lawless_iron_doll/tick/base_move/skill/super_laser/small_laser/recursive + execute if entity @s[distance=..30] positioned ~-0.5 ~-0.5 ~-0.5 unless entity @a[tag=!PlayerShouldInvulnerable,dx=0] positioned ~0.5 ~0.5 ~0.5 positioned ^ ^ ^1 if block ~ ~ ~ #lib:no_collision/ run function asset:mob/0437.lawless_iron_doll/tick/base_move/skill/super_laser/small_laser/recursive diff --git a/Asset/data/asset/functions/mob/0437.lawless_iron_doll/tick/base_move/skill/super_laser/tick.mcfunction b/Asset/data/asset/functions/mob/0437.lawless_iron_doll/tick/base_move/skill/super_laser/tick.mcfunction index 8705b41a1a9..16a1f494250 100644 --- a/Asset/data/asset/functions/mob/0437.lawless_iron_doll/tick/base_move/skill/super_laser/tick.mcfunction +++ b/Asset/data/asset/functions/mob/0437.lawless_iron_doll/tick/base_move/skill/super_laser/tick.mcfunction @@ -42,7 +42,7 @@ execute if score @s General.Mob.Tick matches 47..77 positioned ~ ~3 ~ run function asset:mob/0437.lawless_iron_doll/tick/base_move/skill/super_laser/big_laser/tick # ニュートラルポーズに戻る - execute if score @s General.Mob.Tick matches 90.. unless block ~ ~-0.5 ~ #lib:no_collision as @e[type=item_display,tag=C5.ModelRoot.Target,sort=nearest,limit=1] run function animated_java:lawless_iron_doll/animations/neutral/tween {to_frame: 0, duration: 5} + execute if score @s General.Mob.Tick matches 90.. unless block ~ ~-0.5 ~ #lib:no_collision/ as @e[type=item_display,tag=C5.ModelRoot.Target,sort=nearest,limit=1] run function animated_java:lawless_iron_doll/animations/neutral/tween {to_frame: 0, duration: 5} # おつかれタグを付与する。次の行動は絶対歩行になる。 execute if score @s General.Mob.Tick matches 110.. run tag @s add C5.Exhausted diff --git a/Asset/data/asset/functions/mob/0437.lawless_iron_doll/tick/base_move/walk/tick.mcfunction b/Asset/data/asset/functions/mob/0437.lawless_iron_doll/tick/base_move/walk/tick.mcfunction index f4d0aa0cbfa..1b84540e750 100644 --- a/Asset/data/asset/functions/mob/0437.lawless_iron_doll/tick/base_move/walk/tick.mcfunction +++ b/Asset/data/asset/functions/mob/0437.lawless_iron_doll/tick/base_move/walk/tick.mcfunction @@ -20,11 +20,11 @@ # 10tickごとに処理を実行 scoreboard players operation $Interval Temporary %= $10 Const # 下に何かあるなら、ゴツンゴツン - execute if score $Interval Temporary matches 0 unless block ~ ~-0.25 ~ #lib:no_collision run playsound minecraft:entity.iron_golem.step hostile @a ~ ~ ~ 2.5 0.5 - execute if score $Interval Temporary matches 0 unless block ~ ~-0.25 ~ #lib:no_collision run playsound minecraft:entity.iron_golem.step hostile @a ~ ~ ~ 2.5 0.6 + execute if score $Interval Temporary matches 0 unless block ~ ~-0.25 ~ #lib:no_collision/ run playsound minecraft:entity.iron_golem.step hostile @a ~ ~ ~ 2.5 0.5 + execute if score $Interval Temporary matches 0 unless block ~ ~-0.25 ~ #lib:no_collision/ run playsound minecraft:entity.iron_golem.step hostile @a ~ ~ ~ 2.5 0.6 # 下に何もないなら、キラキラ - execute if score $Interval Temporary matches 0 if block ~ ~-0.25 ~ #lib:no_collision run playsound minecraft:block.amethyst_block.place hostile @a ~ ~ ~ 2 0.5 - execute if score $Interval Temporary matches 0 if block ~ ~-0.25 ~ #lib:no_collision run playsound minecraft:block.amethyst_block.chime hostile @a ~ ~ ~ 2 1 + execute if score $Interval Temporary matches 0 if block ~ ~-0.25 ~ #lib:no_collision/ run playsound minecraft:block.amethyst_block.place hostile @a ~ ~ ~ 2 0.5 + execute if score $Interval Temporary matches 0 if block ~ ~-0.25 ~ #lib:no_collision/ run playsound minecraft:block.amethyst_block.chime hostile @a ~ ~ ~ 2 1 # リセット scoreboard players reset $Interval Temporary @@ -32,7 +32,7 @@ function asset:mob/0437.lawless_iron_doll/tick/base_move/common/descend_when_all_player_below # 足元の先が埋まっているなら、上に移動 - execute rotated ~ 0 unless block ^ ^ ^1 #lib:no_collision run tp @s ~ ~0.1 ~ + execute rotated ~ 0 unless block ^ ^ ^1 #lib:no_collision/ run tp @s ~ ~0.1 ~ # まっすぐ前に歩く execute at @s run tp @s ^ ^ ^0.2 ~ 0 diff --git a/Asset/data/asset/functions/mob/1004.tultaria/tick/.mcfunction b/Asset/data/asset/functions/mob/1004.tultaria/tick/.mcfunction index 3bb34a3bde5..e2153ca9074 100644 --- a/Asset/data/asset/functions/mob/1004.tultaria/tick/.mcfunction +++ b/Asset/data/asset/functions/mob/1004.tultaria/tick/.mcfunction @@ -57,7 +57,7 @@ execute if entity @s[tag=RW.Break] run function asset:mob/1004.tultaria/tick/base_move/break/tick # 足元が埋まっている間は上にちょっとずつ登る - execute unless block ~ ~ ~ #lib:no_collision run tp @s ~ ~0.2 ~ + execute unless block ~ ~ ~ #lib:no_collision/ run tp @s ~ ~0.2 ~ # リセット tag @e[type=item_display,tag=RW.ModelRoot.Target,distance=..64,limit=1] remove RW.ModelRoot.Target diff --git a/Asset/data/asset/functions/mob/1004.tultaria/tick/base_move/.mcfunction b/Asset/data/asset/functions/mob/1004.tultaria/tick/base_move/.mcfunction index f5b6c2bad92..49766941f92 100644 --- a/Asset/data/asset/functions/mob/1004.tultaria/tick/base_move/.mcfunction +++ b/Asset/data/asset/functions/mob/1004.tultaria/tick/base_move/.mcfunction @@ -33,6 +33,6 @@ execute if entity @s[tag=!RW.DisableInertia,scores={RW.FakeInertia=0..}] run function asset:mob/1004.tultaria/tick/base_move/fake_inertia # 下が空気なら通常実行 - # execute if entity @s[tag=!RW.DisableInertia,scores={RW.FakeInertia=0..}] if block ~ ~-1 ~ #lib:no_collision run function asset:mob/1004.tultaria/tick/base_move/fake_inertia + # execute if entity @s[tag=!RW.DisableInertia,scores={RW.FakeInertia=0..}] if block ~ ~-1 ~ #lib:no_collision/ run function asset:mob/1004.tultaria/tick/base_move/fake_inertia # 下が空気じゃないなら縦軸を無視 - # execute if entity @s[tag=!RW.DisableInertia,scores={RW.FakeInertia=0..}] unless block ~ ~-1 ~ #lib:no_collision rotated ~ 0 run function asset:mob/1004.tultaria/tick/base_move/fake_inertia + # execute if entity @s[tag=!RW.DisableInertia,scores={RW.FakeInertia=0..}] unless block ~ ~-1 ~ #lib:no_collision/ rotated ~ 0 run function asset:mob/1004.tultaria/tick/base_move/fake_inertia diff --git a/Asset/data/asset/functions/mob/1004.tultaria/tick/move/teleport/place_marker.m.mcfunction b/Asset/data/asset/functions/mob/1004.tultaria/tick/move/teleport/place_marker.m.mcfunction index de9fdaf742d..88ce436efd3 100644 --- a/Asset/data/asset/functions/mob/1004.tultaria/tick/move/teleport/place_marker.m.mcfunction +++ b/Asset/data/asset/functions/mob/1004.tultaria/tick/move/teleport/place_marker.m.mcfunction @@ -11,8 +11,8 @@ $summon marker ~ $(Y).5 ~ {Tags:[RW.TeleportMarker,RW.MarkerInit]} # 拡散値 - execute if block ~ ~-1 ~ #lib:no_collision run data modify storage lib: Argument.Bounds set value [[4d,6d],[0d,0d],[4d,6d]] - execute unless block ~ ~-1 ~ #lib:no_collision run data modify storage lib: Argument.Bounds set value [[4d,6d],[0d,0d],[4d,6d]] + execute if block ~ ~-1 ~ #lib:no_collision/ run data modify storage lib: Argument.Bounds set value [[4d,6d],[0d,0d],[4d,6d]] + execute unless block ~ ~-1 ~ #lib:no_collision/ run data modify storage lib: Argument.Bounds set value [[4d,6d],[0d,0d],[4d,6d]] execute as @e[type=marker,tag=RW.TeleportMarker,tag=RW.MarkerInit] at @s run function lib:spread_entity/ # リセット diff --git a/Asset/data/asset/functions/mob/1004.tultaria/tick/skill/common/search_ground/.mcfunction b/Asset/data/asset/functions/mob/1004.tultaria/tick/skill/common/search_ground/.mcfunction index e23faf49cff..94ef75e50f3 100644 --- a/Asset/data/asset/functions/mob/1004.tultaria/tick/skill/common/search_ground/.mcfunction +++ b/Asset/data/asset/functions/mob/1004.tultaria/tick/skill/common/search_ground/.mcfunction @@ -5,7 +5,7 @@ # @within function asset:mob/1004.tultaria/tick/** # 下にずらして再帰 - execute if entity @s[distance=..32] if block ~ ~ ~ #lib:no_collision positioned ~ ~-1 ~ run function asset:mob/1004.tultaria/tick/skill/common/search_ground/ + execute if entity @s[distance=..32] if block ~ ~ ~ #lib:no_collision/ positioned ~ ~-1 ~ run function asset:mob/1004.tultaria/tick/skill/common/search_ground/ # ブロックだったらそこまで移動 - execute unless block ~ ~ ~ #lib:no_collision align xyz run tp @s ~0.5 ~1 ~0.5 \ No newline at end of file + execute unless block ~ ~ ~ #lib:no_collision/ align xyz run tp @s ~0.5 ~1 ~0.5 diff --git a/Asset/data/asset/functions/mob/1004.tultaria/tick/skill/thunder/aiming_laser/alert.mcfunction b/Asset/data/asset/functions/mob/1004.tultaria/tick/skill/thunder/aiming_laser/alert.mcfunction index ed97fd9fe83..119bc1d1d01 100644 --- a/Asset/data/asset/functions/mob/1004.tultaria/tick/skill/thunder/aiming_laser/alert.mcfunction +++ b/Asset/data/asset/functions/mob/1004.tultaria/tick/skill/thunder/aiming_laser/alert.mcfunction @@ -12,4 +12,4 @@ particle minecraft:dust 1 1 0.5 0.5 ^ ^ ^-0.5 0 0 0 0 1 force @a[distance=..30] # 壁がなければ再帰 - execute if entity @s[distance=..30] positioned ^ ^ ^1 if block ~ ~ ~ #lib:no_collision run function asset:mob/1004.tultaria/tick/skill/thunder/aiming_laser/alert + execute if entity @s[distance=..30] positioned ^ ^ ^1 if block ~ ~ ~ #lib:no_collision/ run function asset:mob/1004.tultaria/tick/skill/thunder/aiming_laser/alert diff --git a/Asset/data/asset/functions/mob/1004.tultaria/tick/skill/thunder/aiming_laser/laser/.mcfunction b/Asset/data/asset/functions/mob/1004.tultaria/tick/skill/thunder/aiming_laser/laser/.mcfunction index f83d37bd37e..3bc6c59299f 100644 --- a/Asset/data/asset/functions/mob/1004.tultaria/tick/skill/thunder/aiming_laser/laser/.mcfunction +++ b/Asset/data/asset/functions/mob/1004.tultaria/tick/skill/thunder/aiming_laser/laser/.mcfunction @@ -15,10 +15,10 @@ execute positioned ~-0.5 ~-0.5 ~-0.5 if entity @a[tag=!PlayerShouldInvulnerable,dx=0] positioned ~0.5 ~0.5 ~0.5 run function asset:mob/1004.tultaria/tick/skill/thunder/aiming_laser/laser/hit # 壁ヒットで炸裂 - execute unless block ^ ^ ^1 #lib:no_collision run function asset:mob/1004.tultaria/tick/skill/thunder/aiming_laser/laser/hit + execute unless block ^ ^ ^1 #lib:no_collision/ run function asset:mob/1004.tultaria/tick/skill/thunder/aiming_laser/laser/hit # 後でレーザーの長さを決めるためにスコア加算 scoreboard players add @s Temporary 1 # 壁がなかったり、プレイヤーにあたったりしなければ再帰 - execute if entity @s[distance=..30] positioned ~-0.5 ~-0.5 ~-0.5 unless entity @a[tag=!PlayerShouldInvulnerable,dx=0] positioned ~0.5 ~0.5 ~0.5 positioned ^ ^ ^1 if block ~ ~ ~ #lib:no_collision run function asset:mob/1004.tultaria/tick/skill/thunder/aiming_laser/laser/ + execute if entity @s[distance=..30] positioned ~-0.5 ~-0.5 ~-0.5 unless entity @a[tag=!PlayerShouldInvulnerable,dx=0] positioned ~0.5 ~0.5 ~0.5 positioned ^ ^ ^1 if block ~ ~ ~ #lib:no_collision/ run function asset:mob/1004.tultaria/tick/skill/thunder/aiming_laser/laser/ diff --git a/Asset/data/asset/functions/mob/1004.tultaria/tick/skill/thunder/lightning_stab/hyper_stab/recursive.mcfunction b/Asset/data/asset/functions/mob/1004.tultaria/tick/skill/thunder/lightning_stab/hyper_stab/recursive.mcfunction index 1bdcb0c4422..48b4c4696be 100644 --- a/Asset/data/asset/functions/mob/1004.tultaria/tick/skill/thunder/lightning_stab/hyper_stab/recursive.mcfunction +++ b/Asset/data/asset/functions/mob/1004.tultaria/tick/skill/thunder/lightning_stab/hyper_stab/recursive.mcfunction @@ -12,13 +12,13 @@ particle minecraft:dust 1 1 0.2 1 ~ ~1 ~ 0.1 0.1 0.1 0 10 force @a[distance=..30] # 壁があったらそこにワープする - execute positioned ^ ^ ^1 unless block ~ ~1 ~ #lib:no_collision run tp @s ~ ~ ~ ~ ~ + execute positioned ^ ^ ^1 unless block ~ ~1 ~ #lib:no_collision/ run tp @s ~ ~ ~ ~ ~ # ダメージ判定 execute positioned ~-0.5 ~-0.5 ~-0.5 if entity @a[tag=!PlayerShouldInvulnerable,dx=0] run function asset:mob/1004.tultaria/tick/skill/thunder/lightning_stab/hyper_stab/damage # 壁がなかったり、遠すぎたりしなければ再帰: returnを入れることで、これの実行に成功した場合はこれより下を実行しない - execute if entity @s[distance=..16] positioned ^ ^ ^1 if block ~ ~1 ~ #lib:no_collision run return run function asset:mob/1004.tultaria/tick/skill/thunder/lightning_stab/hyper_stab/recursive + execute if entity @s[distance=..16] positioned ^ ^ ^1 if block ~ ~1 ~ #lib:no_collision/ run return run function asset:mob/1004.tultaria/tick/skill/thunder/lightning_stab/hyper_stab/recursive # 壁がなくても遠かったらそこにワープする tp @s ~ ~ ~ diff --git a/Asset/data/asset/functions/mob/1004.tultaria/tick/skill/thunder/lightning_stab/tick.mcfunction b/Asset/data/asset/functions/mob/1004.tultaria/tick/skill/thunder/lightning_stab/tick.mcfunction index 55fb96dad66..f853bb65331 100644 --- a/Asset/data/asset/functions/mob/1004.tultaria/tick/skill/thunder/lightning_stab/tick.mcfunction +++ b/Asset/data/asset/functions/mob/1004.tultaria/tick/skill/thunder/lightning_stab/tick.mcfunction @@ -30,7 +30,7 @@ execute if score @s[scores={RW.Phase=3}] General.Mob.Tick matches 20 run scoreboard players set @s[scores={RW.LoopCount=..4}] General.Mob.Tick 9 # 埋まりそうになったら移動をやめる - execute at @s[scores={General.Mob.Tick=21}] positioned ~ ~0.5 ~ unless block ^ ^ ^2 #lib:no_collision run function asset:mob/1004.tultaria/tick/skill/thunder/lightning_stab/stop + execute at @s[scores={General.Mob.Tick=21}] positioned ~ ~0.5 ~ unless block ^ ^ ^2 #lib:no_collision/ run function asset:mob/1004.tultaria/tick/skill/thunder/lightning_stab/stop # 最後の一個を設置 execute if score @s[scores={RW.Phase=1}] General.Mob.Tick matches 25 run summon marker ~ ~1 ~ {Tags:["RW.ChainLightning.Common","RW.ChainLightning4"]} diff --git a/Asset/data/asset/functions/mob/1005.illusion_of_loyalty/tick/moveset/skill/thunder/aiming_laser/alert.mcfunction b/Asset/data/asset/functions/mob/1005.illusion_of_loyalty/tick/moveset/skill/thunder/aiming_laser/alert.mcfunction index b5f53d309f9..fe60a35873b 100644 --- a/Asset/data/asset/functions/mob/1005.illusion_of_loyalty/tick/moveset/skill/thunder/aiming_laser/alert.mcfunction +++ b/Asset/data/asset/functions/mob/1005.illusion_of_loyalty/tick/moveset/skill/thunder/aiming_laser/alert.mcfunction @@ -12,4 +12,4 @@ particle minecraft:dust 1 1 0.5 0.5 ^ ^ ^-0.5 0 0 0 0 1 force @a[distance=..30] # 壁がなければ再帰 - execute if entity @s[distance=..30] positioned ^ ^ ^1 if block ~ ~ ~ #lib:no_collision run function asset:mob/1005.illusion_of_loyalty/tick/moveset/skill/thunder/aiming_laser/alert + execute if entity @s[distance=..30] positioned ^ ^ ^1 if block ~ ~ ~ #lib:no_collision/ run function asset:mob/1005.illusion_of_loyalty/tick/moveset/skill/thunder/aiming_laser/alert diff --git a/Asset/data/asset/functions/mob/1005.illusion_of_loyalty/tick/moveset/skill/thunder/aiming_laser/laser/.mcfunction b/Asset/data/asset/functions/mob/1005.illusion_of_loyalty/tick/moveset/skill/thunder/aiming_laser/laser/.mcfunction index 66ed46644af..983588541af 100644 --- a/Asset/data/asset/functions/mob/1005.illusion_of_loyalty/tick/moveset/skill/thunder/aiming_laser/laser/.mcfunction +++ b/Asset/data/asset/functions/mob/1005.illusion_of_loyalty/tick/moveset/skill/thunder/aiming_laser/laser/.mcfunction @@ -15,10 +15,10 @@ execute positioned ~-0.5 ~-0.5 ~-0.5 if entity @a[tag=!PlayerShouldInvulnerable,dx=0] positioned ~0.5 ~0.5 ~0.5 run function asset:mob/1005.illusion_of_loyalty/tick/moveset/skill/thunder/aiming_laser/laser/hit # 壁ヒットで炸裂 - execute unless block ^ ^ ^1 #lib:no_collision run function asset:mob/1005.illusion_of_loyalty/tick/moveset/skill/thunder/aiming_laser/laser/hit + execute unless block ^ ^ ^1 #lib:no_collision/ run function asset:mob/1005.illusion_of_loyalty/tick/moveset/skill/thunder/aiming_laser/laser/hit # 後でレーザーの長さを決めるためにスコア加算 scoreboard players add @s Temporary 1 # 壁がなかったり、プレイヤーにあたったりしなければ再帰 - execute if entity @s[distance=..30] positioned ~-0.5 ~-0.5 ~-0.5 unless entity @a[tag=!PlayerShouldInvulnerable,dx=0] positioned ~0.5 ~0.5 ~0.5 positioned ^ ^ ^1 if block ~ ~ ~ #lib:no_collision run function asset:mob/1005.illusion_of_loyalty/tick/moveset/skill/thunder/aiming_laser/laser/ + execute if entity @s[distance=..30] positioned ~-0.5 ~-0.5 ~-0.5 unless entity @a[tag=!PlayerShouldInvulnerable,dx=0] positioned ~0.5 ~0.5 ~0.5 positioned ^ ^ ^1 if block ~ ~ ~ #lib:no_collision/ run function asset:mob/1005.illusion_of_loyalty/tick/moveset/skill/thunder/aiming_laser/laser/ diff --git a/Asset/data/asset/functions/object/0001.abstract_projectile/detect_hit_block/.mcfunction b/Asset/data/asset/functions/object/0001.abstract_projectile/detect_hit_block/.mcfunction index c92a32faafe..13381b414f6 100644 --- a/Asset/data/asset/functions/object/0001.abstract_projectile/detect_hit_block/.mcfunction +++ b/Asset/data/asset/functions/object/0001.abstract_projectile/detect_hit_block/.mcfunction @@ -5,4 +5,4 @@ # @within asset:object/alias/1/detect_hit_block # 判定 - execute unless block ~ ~ ~ #lib:no_collision run data modify storage asset:context IsHitBlock set value true + execute unless block ~ ~ ~ #lib:no_collision/ run data modify storage asset:context IsHitBlock set value true diff --git a/Asset/data/asset/functions/object/1011.456_dice/tick/beam/recursive.mcfunction b/Asset/data/asset/functions/object/1011.456_dice/tick/beam/recursive.mcfunction index 4e23d9d321a..77aa1e3e7f5 100644 --- a/Asset/data/asset/functions/object/1011.456_dice/tick/beam/recursive.mcfunction +++ b/Asset/data/asset/functions/object/1011.456_dice/tick/beam/recursive.mcfunction @@ -8,7 +8,7 @@ # 着弾検知 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 unless block ^ ^ ^0.5 #lib:no_collision/ run tag @s add Landing # ターゲットにタグ付与 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 diff --git a/Asset/data/asset/functions/object/1015.call_fish/tick/find_target/recursive.mcfunction b/Asset/data/asset/functions/object/1015.call_fish/tick/find_target/recursive.mcfunction index 98db7ca2be9..6dd864b815a 100644 --- a/Asset/data/asset/functions/object/1015.call_fish/tick/find_target/recursive.mcfunction +++ b/Asset/data/asset/functions/object/1015.call_fish/tick/find_target/recursive.mcfunction @@ -14,7 +14,7 @@ execute if score $RecursiveLimit Temporary matches 20.. run return fail # 0.5ブロック先がブロックならreturn - execute unless block ^ ^ ^0.5 #lib:no_collision run return fail + execute unless block ^ ^ ^0.5 #lib:no_collision/ run return fail # 自身と接触したら自身にtag付与、そしてstorage設定してreturn execute positioned ~-0.5 ~-0.5 ~-0.5 if entity @s[dx=0] run tag @s add 1015.Target diff --git a/Asset/data/asset/functions/object/1019.voltage_bullet/detect_hit_block/.mcfunction b/Asset/data/asset/functions/object/1019.voltage_bullet/detect_hit_block/.mcfunction index bc99aac425c..66582fb8d9d 100644 --- a/Asset/data/asset/functions/object/1019.voltage_bullet/detect_hit_block/.mcfunction +++ b/Asset/data/asset/functions/object/1019.voltage_bullet/detect_hit_block/.mcfunction @@ -5,4 +5,4 @@ # @within asset:object/alias/1019/detect_hit_block # 判定 - execute unless block ^ ^ ^0.5 #lib:no_collision run data modify storage asset:context IsHitBlock set value true + execute unless block ^ ^ ^0.5 #lib:no_collision/ run data modify storage asset:context IsHitBlock set value true 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 1a30ccd40af..7f8c32bcb07 100644 --- a/Asset/data/asset/functions/object/1019.voltage_bullet/tick/.mcfunction +++ b/Asset/data/asset/functions/object/1019.voltage_bullet/tick/.mcfunction @@ -12,7 +12,7 @@ # ..5の時、前方にブロックがあればMovePerStepを0に # 飛翔体抽象の実装の都合上、hit_blockメソッドでMovePerStepを0にしても進んでいってしまうため？ - 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 + 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 diff --git a/Asset/data/asset/functions/object/1040.thelema_persuit_sword/detect_hit_block/.mcfunction b/Asset/data/asset/functions/object/1040.thelema_persuit_sword/detect_hit_block/.mcfunction index f65ae3ddafe..19fd72f6766 100644 --- a/Asset/data/asset/functions/object/1040.thelema_persuit_sword/detect_hit_block/.mcfunction +++ b/Asset/data/asset/functions/object/1040.thelema_persuit_sword/detect_hit_block/.mcfunction @@ -5,4 +5,4 @@ # @within asset:object/alias/1040/detect_hit_block # 18tick以降にブロック接触判定 - execute if entity @s[scores={General.Object.Tick=18..}] unless block ~ ~-0.2 ~ #lib:no_collision run data modify storage asset:context IsHitBlock set value true + execute if entity @s[scores={General.Object.Tick=18..}] unless block ~ ~-0.2 ~ #lib:no_collision/ run data modify storage asset:context IsHitBlock set value true diff --git a/Asset/data/asset/functions/object/1042.mini_black_hole_flying/detect_hit_block/.mcfunction b/Asset/data/asset/functions/object/1042.mini_black_hole_flying/detect_hit_block/.mcfunction index 0c98693fccb..a58ad1bfd6d 100644 --- a/Asset/data/asset/functions/object/1042.mini_black_hole_flying/detect_hit_block/.mcfunction +++ b/Asset/data/asset/functions/object/1042.mini_black_hole_flying/detect_hit_block/.mcfunction @@ -5,4 +5,4 @@ # @within asset:object/alias/1042/detect_hit_block # 判定 - execute unless block ^ ^ ^0.375 #lib:no_collision run data modify storage asset:context IsHitBlock set value true + execute unless block ^ ^ ^0.375 #lib:no_collision/ run data modify storage asset:context IsHitBlock set value true diff --git a/Asset/data/asset/functions/object/1049.lexiel_rod_fireball/detect_hit_block/.mcfunction b/Asset/data/asset/functions/object/1049.lexiel_rod_fireball/detect_hit_block/.mcfunction index f4b53cdb30a..ef0f19ecdbb 100644 --- a/Asset/data/asset/functions/object/1049.lexiel_rod_fireball/detect_hit_block/.mcfunction +++ b/Asset/data/asset/functions/object/1049.lexiel_rod_fireball/detect_hit_block/.mcfunction @@ -5,4 +5,4 @@ # @within asset:object/alias/1049/detect_hit_block # 判定 - execute unless block ~ ~ ~ #lib:no_collision run data modify storage asset:context IsHitBlock set value true + execute unless block ~ ~ ~ #lib:no_collision/ run data modify storage asset:context IsHitBlock set value true 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 682a7220feb..d24d819d52a 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 @@ -8,7 +8,7 @@ # 着弾検知 execute if entity @e[type=#lib:living,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 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 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 ba3c82aa9b6..4076008fecc 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 @@ -14,7 +14,7 @@ # 着弾検知 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 unless block ^ ^ ^1 #lib:no_collision 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 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 10a35852da1..1281c52824a 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 @@ -9,7 +9,7 @@ # 着弾検知 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 unless block ^ ^ ^0.5 #lib:no_collision 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 diff --git a/Asset/data/asset/functions/object/1054.ride_missile/detect_hit_block/.mcfunction b/Asset/data/asset/functions/object/1054.ride_missile/detect_hit_block/.mcfunction index ed62412edd1..950965b6bd9 100644 --- a/Asset/data/asset/functions/object/1054.ride_missile/detect_hit_block/.mcfunction +++ b/Asset/data/asset/functions/object/1054.ride_missile/detect_hit_block/.mcfunction @@ -4,5 +4,5 @@ # # @within asset:object/alias/1054/detect_hit_block -execute unless block ^ ^ ^0.5 #lib:no_collision run data modify storage asset:context IsHitBlock set value true -execute unless block ^ ^ ^1.0 #lib:no_collision run data modify storage asset:context IsHitBlock set value true +execute unless block ^ ^ ^0.5 #lib:no_collision/ run data modify storage asset:context IsHitBlock set value true +execute unless block ^ ^ ^1.0 #lib:no_collision/ run data modify storage asset:context IsHitBlock set value true diff --git a/Asset/data/asset/functions/object/1055.elemental_fish/detect_hit_block/.mcfunction b/Asset/data/asset/functions/object/1055.elemental_fish/detect_hit_block/.mcfunction index c8d1aecb77f..52584e501c3 100644 --- a/Asset/data/asset/functions/object/1055.elemental_fish/detect_hit_block/.mcfunction +++ b/Asset/data/asset/functions/object/1055.elemental_fish/detect_hit_block/.mcfunction @@ -7,13 +7,13 @@ # 接触判定 # 下にブロック - execute unless block ~ ~-1 ~ #lib:no_collision run data modify storage asset:context IsHitBlock set value true - execute unless block ~ ~-1 ~ #lib:no_collision run tag @s add 1055.Upper + execute unless block ~ ~-1 ~ #lib:no_collision/ run data modify storage asset:context IsHitBlock set value true + execute unless block ~ ~-1 ~ #lib:no_collision/ run tag @s add 1055.Upper # 上にブロック - execute unless block ~ ~1 ~ #lib:no_collision run data modify storage asset:context IsHitBlock set value true - execute unless block ~ ~1 ~ #lib:no_collision run tag @s add 1055.Lower + execute unless block ~ ~1 ~ #lib:no_collision/ run data modify storage asset:context IsHitBlock set value true + execute unless block ~ ~1 ~ #lib:no_collision/ run tag @s add 1055.Lower # 前方にブロック - execute unless block ^ ^ ^0.5 #lib:no_collision run data modify storage asset:context IsHitBlock set value true - execute unless block ^ ^ ^0.5 #lib:no_collision run tag @s add 1055.Forward + execute unless block ^ ^ ^0.5 #lib:no_collision/ run data modify storage asset:context IsHitBlock set value true + execute unless block ^ ^ ^0.5 #lib:no_collision/ run tag @s add 1055.Forward 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 149d7883b14..04699f776d5 100644 --- a/Asset/data/asset/functions/object/1057.giant_pumpkin/tick/.mcfunction +++ b/Asset/data/asset/functions/object/1057.giant_pumpkin/tick/.mcfunction @@ -19,9 +19,9 @@ execute if entity @s[tag=2031.HighSpeedSpinning] run tag @e[type=#lib:living,tag=Targetable,distance=..30] remove Targetable # 下に落ちる - execute at @s if block ~ ~-1.7 ~ #lib:no_collision_without_fluid run tp @s ~ ~-0.2 ~ - execute at @s if block ~ ~-1.7 ~ #lib:no_collision_without_fluid run tp @s ~ ~-0.2 ~ - execute at @s if block ~ ~-1.7 ~ #lib:no_collision_without_fluid run tp @s ~ ~-0.2 ~ + execute at @s if block ~ ~-1.7 ~ #lib:no_collision/without_fluid run tp @s ~ ~-0.2 ~ + execute at @s if block ~ ~-1.7 ~ #lib:no_collision/without_fluid run tp @s ~ ~-0.2 ~ + execute at @s if block ~ ~-1.7 ~ #lib:no_collision/without_fluid run tp @s ~ ~-0.2 ~ # 継承 execute at @s run function asset:object/super.tick 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 8665d3b4fef..925b47888b8 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 @@ -16,8 +16,8 @@ particle enchant ~ ~ ~ 0.25 0.25 0.25 0 2 force @a[distance=..40] # 接地で上を向く - execute unless block ~ ~-0.1 ~ #lib:no_collision at @s run tp @s ~ ~ ~ ~ ~-35 - execute unless block ~ ~1 ~ #lib:no_collision at @s run tp @s ~ ~ ~ ~ ~80 + execute unless block ~ ~-0.1 ~ #lib:no_collision/ at @s run tp @s ~ ~ ~ ~ ~-35 + execute unless block ~ ~1 ~ #lib:no_collision/ at @s run tp @s ~ ~ ~ ~ ~80 # 周囲にプレイヤーがいない場合、プレイヤーを追尾 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 ~ ~ @@ -37,8 +37,8 @@ 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 unless block ^ ^ ^0.5 #lib:no_collision at @s run tp @s ~ ~ ~ ~45 ~-45 - execute at @s unless block ^ ^ ^0.2 #lib:no_collision at @s run tp @s ~ ~ ~ ~45 ~-45 + execute unless block ^ ^ ^0.5 #lib:no_collision/ at @s run tp @s ~ ~ ~ ~45 ~-45 + execute at @s unless block ^ ^ ^0.2 #lib:no_collision/ at @s run tp @s ~ ~ ~ ~45 ~-45 # 離れ過ぎたら消える execute unless entity @a[tag=1059.OwnerPlayer,distance=..70] run function asset:object/1059.book_of_hero/tick/kill 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 f57f7f3b9f7..c23f346b63f 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 @@ -8,7 +8,7 @@ # 着弾検知 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 unless block ^ ^ ^0.5 #lib:no_collision 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 diff --git a/Asset/data/asset/functions/object/1080.meteor_rain/detect_hit_block/check/with_target.m.mcfunction b/Asset/data/asset/functions/object/1080.meteor_rain/detect_hit_block/check/with_target.m.mcfunction index 6333c1ff438..316b8c40235 100644 --- a/Asset/data/asset/functions/object/1080.meteor_rain/detect_hit_block/check/with_target.m.mcfunction +++ b/Asset/data/asset/functions/object/1080.meteor_rain/detect_hit_block/check/with_target.m.mcfunction @@ -6,5 +6,5 @@ # @within function asset:object/1080.meteor_rain/detect_hit_block/ # 判定 - $execute positioned ~-50 ~-1 ~-50 unless entity @e[type=#lib:living,scores={MobUUID=$(TargetID)},dx=99,dy=-50,dz=99] at @s unless block ^ ^ ^$(MovePerStep) #lib:no_collision run data modify storage asset:context IsHitBlock set value true - #execute positioned ~-50 ~ ~-50 unless entity @e[type=#lib:living,scores={MobUUID=16708},dx=99,dy=-50,dz=99] at @s unless block ~ ~ ~ #lib:no_collision run data modify storage asset:context IsHitBlock set value true + $execute positioned ~-50 ~-1 ~-50 unless entity @e[type=#lib:living,scores={MobUUID=$(TargetID)},dx=99,dy=-50,dz=99] at @s unless block ^ ^ ^$(MovePerStep) #lib:no_collision/ run data modify storage asset:context IsHitBlock set value true + #execute positioned ~-50 ~ ~-50 unless entity @e[type=#lib:living,scores={MobUUID=16708},dx=99,dy=-50,dz=99] at @s unless block ~ ~ ~ #lib:no_collision/ run data modify storage asset:context IsHitBlock set value true diff --git a/Asset/data/asset/functions/object/1080.meteor_rain/detect_hit_block/check/without_target.m.mcfunction b/Asset/data/asset/functions/object/1080.meteor_rain/detect_hit_block/check/without_target.m.mcfunction index 8f412610387..b16c45a7dea 100644 --- a/Asset/data/asset/functions/object/1080.meteor_rain/detect_hit_block/check/without_target.m.mcfunction +++ b/Asset/data/asset/functions/object/1080.meteor_rain/detect_hit_block/check/without_target.m.mcfunction @@ -5,4 +5,4 @@ # @within function asset:object/1080.meteor_rain/detect_hit_block/ # 判定 - $execute unless block ^ ^ ^$(MovePerStep) #lib:no_collision run data modify storage asset:context IsHitBlock set value true + $execute unless block ^ ^ ^$(MovePerStep) #lib:no_collision/ run data modify storage asset:context IsHitBlock set value true diff --git a/Asset/data/asset/functions/object/1091.flame_boomerang/detect_hit_block/.mcfunction b/Asset/data/asset/functions/object/1091.flame_boomerang/detect_hit_block/.mcfunction index 34b53018527..bd90e72f84a 100644 --- a/Asset/data/asset/functions/object/1091.flame_boomerang/detect_hit_block/.mcfunction +++ b/Asset/data/asset/functions/object/1091.flame_boomerang/detect_hit_block/.mcfunction @@ -5,4 +5,4 @@ # @within asset:object/alias/1091/detect_hit_block # 判定 - execute on passengers at @s unless block ^ ^ ^0.75 #lib:no_collision run data modify storage asset:context IsHitBlock set value true + execute on passengers at @s unless block ^ ^ ^0.75 #lib:no_collision/ run data modify storage asset:context IsHitBlock set value true diff --git a/Asset/data/asset/functions/object/1091.flame_boomerang/hit_block/.mcfunction b/Asset/data/asset/functions/object/1091.flame_boomerang/hit_block/.mcfunction index a2cedfe8768..d903849e5c1 100644 --- a/Asset/data/asset/functions/object/1091.flame_boomerang/hit_block/.mcfunction +++ b/Asset/data/asset/functions/object/1091.flame_boomerang/hit_block/.mcfunction @@ -9,8 +9,8 @@ #declare tag HitGround # すぐ上、下がブロックなら反射する - execute on passengers at @s unless block ~ ~-0.4 ~ #lib:no_collision on vehicle run tag @s add HitGround - execute on passengers at @s unless block ~ ~0.4 ~ #lib:no_collision on vehicle run tag @s add HitGround + execute on passengers at @s unless block ~ ~-0.4 ~ #lib:no_collision/ on vehicle run tag @s add HitGround + execute on passengers at @s unless block ~ ~0.4 ~ #lib:no_collision/ on vehicle run tag @s add HitGround execute if entity @s[tag=HitGround] run scoreboard players set $Speed Lib 10 execute if entity @s[tag=HitGround] run function lib:reflection_bullet/ 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 1f5cb6c85f7..4bbee2afd72 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 @@ -8,7 +8,7 @@ # 着弾検知 execute if entity @e[type=#lib:living,type=!player,tag=!Uninterferable,distance=..2] run tag @s add Landing - execute unless block ^ ^ ^0.5 #lib:no_collision 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 diff --git a/Asset/data/asset/functions/object/1096.was_laser/tick/shoot/ray.mcfunction b/Asset/data/asset/functions/object/1096.was_laser/tick/shoot/ray.mcfunction index 57510547765..46dde848edf 100644 --- a/Asset/data/asset/functions/object/1096.was_laser/tick/shoot/ray.mcfunction +++ b/Asset/data/asset/functions/object/1096.was_laser/tick/shoot/ray.mcfunction @@ -15,4 +15,4 @@ scoreboard players add $Range Temporary 1 # 30ブロック進む、または衝突するまで再帰 - execute if score $Range Temporary matches ..19 positioned ^ ^ ^1 if block ^ ^ ^ #lib:no_collision run function asset:object/1096.was_laser/tick/shoot/ray + execute if score $Range Temporary matches ..19 positioned ^ ^ ^1 if block ^ ^ ^ #lib:no_collision/ run function asset:object/1096.was_laser/tick/shoot/ray diff --git a/Asset/data/asset/functions/object/1100.conviction_shot/tick/check_forward_block.mcfunction b/Asset/data/asset/functions/object/1100.conviction_shot/tick/check_forward_block.mcfunction index cb49bb39841..cc6c2cead16 100644 --- a/Asset/data/asset/functions/object/1100.conviction_shot/tick/check_forward_block.mcfunction +++ b/Asset/data/asset/functions/object/1100.conviction_shot/tick/check_forward_block.mcfunction @@ -5,4 +5,4 @@ # @within function asset:object/1100.conviction_shot/tick/ # 前方に壁があればMovePerStepを0に - $execute unless block ^ ^ ^$(MovePerStep) #lib:no_collision run data modify storage asset:context this.MovePerStep set value 0 + $execute unless block ^ ^ ^$(MovePerStep) #lib:no_collision/ run data modify storage asset:context this.MovePerStep set value 0 diff --git a/Asset/data/asset/functions/object/1101.tnt/tick/damage/check_block.mcfunction b/Asset/data/asset/functions/object/1101.tnt/tick/damage/check_block.mcfunction index 390881f1495..d307d91297d 100644 --- a/Asset/data/asset/functions/object/1101.tnt/tick/damage/check_block.mcfunction +++ b/Asset/data/asset/functions/object/1101.tnt/tick/damage/check_block.mcfunction @@ -7,7 +7,7 @@ # asset:object/1101.tnt/tick/damage/check_block # 現座標がブロックならreturn - execute unless block ~ ~ ~ #lib:no_collision run return fail + execute unless block ~ ~ ~ #lib:no_collision/ run return fail # thisに接触したならTagを付与してreturn execute positioned ~-0.5 ~-0.5 ~-0.5 if entity @e[type=marker,tag=this,dx=0] run return run tag @s add 1101.Hit 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 78fc4d9d8ca..e374ddd5f5b 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 @@ -8,7 +8,7 @@ # 着弾検知 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 unless block ^ ^ ^0.5 #lib:no_collision 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 diff --git a/Asset/data/asset/functions/object/1107.crystal_dart/detect_hit_block/.mcfunction b/Asset/data/asset/functions/object/1107.crystal_dart/detect_hit_block/.mcfunction index 279de09b347..3607f2513aa 100644 --- a/Asset/data/asset/functions/object/1107.crystal_dart/detect_hit_block/.mcfunction +++ b/Asset/data/asset/functions/object/1107.crystal_dart/detect_hit_block/.mcfunction @@ -5,5 +5,5 @@ # @within asset:object/alias/1107/detect_hit_block # 判定 - execute unless block ^ ^ ^0.5 #lib:no_collision run data modify storage asset:context IsHitBlock set value true - execute unless block ^ ^ ^1.0 #lib:no_collision run data modify storage asset:context IsHitBlock set value true + execute unless block ^ ^ ^0.5 #lib:no_collision/ run data modify storage asset:context IsHitBlock set value true + execute unless block ^ ^ ^1.0 #lib:no_collision/ run data modify storage asset:context IsHitBlock 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 3d7e47d557f..ad2501d3739 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 @@ -10,8 +10,8 @@ # 実行者を反射軌道で0.1m前進 # 反射距離を何ブロック先が埋まってるかで調整する - execute unless block ^ ^ ^1.0 #lib:no_collision run scoreboard players set $Speed Lib 10 - execute unless block ^ ^ ^0.5 #lib:no_collision run scoreboard players set $Speed Lib 5 + execute unless block ^ ^ ^1.0 #lib:no_collision/ run scoreboard players set $Speed Lib 10 + execute unless block ^ ^ ^0.5 #lib:no_collision/ run scoreboard players set $Speed Lib 5 function lib:reflection_bullet/ # 敵がいるならそっちを向く diff --git a/Asset/data/asset/functions/object/1107.crystal_dart/recursive/.mcfunction b/Asset/data/asset/functions/object/1107.crystal_dart/recursive/.mcfunction index d9a694abf05..6a41ea16554 100644 --- a/Asset/data/asset/functions/object/1107.crystal_dart/recursive/.mcfunction +++ b/Asset/data/asset/functions/object/1107.crystal_dart/recursive/.mcfunction @@ -5,7 +5,7 @@ # @within asset:object/alias/1107/recursive # 何らかの理由で埋まってたら消える - execute unless block ~ ~ ~ #lib:no_collision unless block ^ ^ ^-0.5 #lib:no_collision run return run kill @s + execute unless block ~ ~ ~ #lib:no_collision/ unless block ^ ^ ^-0.5 #lib:no_collision/ run return run kill @s # 演出 particle dust 1 0.671 0.957 1 diff --git a/Asset/data/asset/functions/object/1110.heavy_lava_bomb/tick/before_boom.mcfunction b/Asset/data/asset/functions/object/1110.heavy_lava_bomb/tick/before_boom.mcfunction index ff357a55be3..e337b467a59 100644 --- a/Asset/data/asset/functions/object/1110.heavy_lava_bomb/tick/before_boom.mcfunction +++ b/Asset/data/asset/functions/object/1110.heavy_lava_bomb/tick/before_boom.mcfunction @@ -6,8 +6,8 @@ # 下に落ちていく # 水中の場合は減速する - execute unless predicate lib:is_in_water/include_flowing if block ~ ~-0.4 ~ #lib:no_collision run tp @s ~ ~-0.4 ~ - execute if predicate lib:is_in_water/include_flowing if block ~ ~-0.1 ~ #lib:no_collision run tp @s ~ ~-0.1 ~ + execute unless predicate lib:is_in_water/include_flowing if block ~ ~-0.4 ~ #lib:no_collision/ run tp @s ~ ~-0.4 ~ + execute if predicate lib:is_in_water/include_flowing if block ~ ~-0.1 ~ #lib:no_collision/ run tp @s ~ ~-0.1 ~ # 膨らむ execute if entity @s[scores={General.Object.Tick=1003}] run playsound entity.puffer_fish.blow_up neutral @a ~ ~ ~ 0.8 1 diff --git a/Asset/data/asset/functions/object/1111.archer_fish/detect_hit_block/.mcfunction b/Asset/data/asset/functions/object/1111.archer_fish/detect_hit_block/.mcfunction index 4eaa4aa52b2..9989f54a422 100644 --- a/Asset/data/asset/functions/object/1111.archer_fish/detect_hit_block/.mcfunction +++ b/Asset/data/asset/functions/object/1111.archer_fish/detect_hit_block/.mcfunction @@ -5,4 +5,4 @@ # @within asset:object/alias/1111/detect_hit_block # 判定 - execute unless block ^ ^ ^0.5 #lib:no_collision run data modify storage asset:context IsHitBlock set value true + execute unless block ^ ^ ^0.5 #lib:no_collision/ run data modify storage asset:context IsHitBlock set value true 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 9d9db4caa2a..07487832482 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 @@ -11,4 +11,4 @@ # 再帰 scoreboard players add $RecursiveCount Temporary 1 - execute if score $RecursiveCount Temporary matches ..11 positioned ^ ^ ^0.5 if block ~ ~ ~ #lib:no_collision run function asset:object/1114.butterfly_attack/tick/5/damage/find_target_line + execute if score $RecursiveCount Temporary matches ..11 positioned ^ ^ ^0.5 if block ~ ~ ~ #lib:no_collision/ run function asset:object/1114.butterfly_attack/tick/5/damage/find_target_line diff --git a/Asset/data/asset/functions/object/1130.thunder_stiletto/detect_hit_block/.mcfunction b/Asset/data/asset/functions/object/1130.thunder_stiletto/detect_hit_block/.mcfunction index 8bdbe1ddb6c..0c50991e5b5 100644 --- a/Asset/data/asset/functions/object/1130.thunder_stiletto/detect_hit_block/.mcfunction +++ b/Asset/data/asset/functions/object/1130.thunder_stiletto/detect_hit_block/.mcfunction @@ -5,4 +5,4 @@ # @within asset:object/alias/1130/detect_hit_block # 判定 - execute unless block ^ ^ ^0.5 #lib:no_collision run data modify storage asset:context IsHitBlock set value true + execute unless block ^ ^ ^0.5 #lib:no_collision/ run data modify storage asset:context IsHitBlock set value true 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 25c9261e4fe..ba1426ad593 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,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/1142.raging_passion_pickaxe/detect_hit_block/.mcfunction b/Asset/data/asset/functions/object/1142.raging_passion_pickaxe/detect_hit_block/.mcfunction index a05bfbac24d..38daa717a83 100644 --- a/Asset/data/asset/functions/object/1142.raging_passion_pickaxe/detect_hit_block/.mcfunction +++ b/Asset/data/asset/functions/object/1142.raging_passion_pickaxe/detect_hit_block/.mcfunction @@ -5,4 +5,4 @@ # @within asset:object/alias/1142/detect_hit_block # 判定 - execute unless block ^ ^ ^0.5 #lib:no_collision run data modify storage asset:context IsHitBlock set value true + execute unless block ^ ^ ^0.5 #lib:no_collision/ run data modify storage asset:context IsHitBlock set value true diff --git a/Asset/data/asset/functions/object/1145.throwing_ark/detect_hit_block/.mcfunction b/Asset/data/asset/functions/object/1145.throwing_ark/detect_hit_block/.mcfunction index b2c2d59b9d0..7a5b3d3a97f 100644 --- a/Asset/data/asset/functions/object/1145.throwing_ark/detect_hit_block/.mcfunction +++ b/Asset/data/asset/functions/object/1145.throwing_ark/detect_hit_block/.mcfunction @@ -5,4 +5,4 @@ # @within asset:object/alias/1145/detect_hit_block # 壁へのヒット判定 - execute unless block ^ ^ ^0.5 #lib:no_collision run data modify storage asset:context IsHitBlock set value true + execute unless block ^ ^ ^0.5 #lib:no_collision/ run data modify storage asset:context IsHitBlock set value true diff --git a/Asset/data/asset/functions/object/2003.smoke_bomb/tick/tp.m.mcfunction b/Asset/data/asset/functions/object/2003.smoke_bomb/tick/tp.m.mcfunction index 0059bdc352b..28d6214472c 100644 --- a/Asset/data/asset/functions/object/2003.smoke_bomb/tick/tp.m.mcfunction +++ b/Asset/data/asset/functions/object/2003.smoke_bomb/tick/tp.m.mcfunction @@ -9,7 +9,7 @@ # @within function asset:object/2003.smoke_bomb/tick/tp # 自身の座標がブロックで埋まっていた場合はくっつく - $execute unless block ~$(X) ~$(Y) ~$(Z) #lib:no_collision run tag @s add 2003.Stick + $execute unless block ~$(X) ~$(Y) ~$(Z) #lib:no_collision/ run tag @s add 2003.Stick # TPする $execute if entity @s[tag=!2003.Stick] positioned ~$(X) ~$(Y) ~$(Z) run tp @s ~ ~ ~ ~ ~ diff --git a/Asset/data/asset/functions/object/2004.labyria_thunder/init/.mcfunction b/Asset/data/asset/functions/object/2004.labyria_thunder/init/.mcfunction index 62a9d8641c2..fd91269c04f 100644 --- a/Asset/data/asset/functions/object/2004.labyria_thunder/init/.mcfunction +++ b/Asset/data/asset/functions/object/2004.labyria_thunder/init/.mcfunction @@ -10,7 +10,7 @@ # ブロックの直上に来るようにループ処理を行う scoreboard players set $2004.Temp Temporary 16 - execute if block ~ ~ ~ #lib:no_collision unless block ~ ~-0.5 ~ #lib:no_collision run scoreboard players set $2004.Temp Temporary -100 + execute if block ~ ~ ~ #lib:no_collision/ unless block ~ ~-0.5 ~ #lib:no_collision/ run scoreboard players set $2004.Temp Temporary -100 execute if score $2004.Temp Temporary matches 1.. run function asset:object/2004.labyria_thunder/init/loop # ループしてもダメだったらキル diff --git a/Asset/data/asset/functions/object/2004.labyria_thunder/init/loop.mcfunction b/Asset/data/asset/functions/object/2004.labyria_thunder/init/loop.mcfunction index 14923ca7815..547dca4d79d 100644 --- a/Asset/data/asset/functions/object/2004.labyria_thunder/init/loop.mcfunction +++ b/Asset/data/asset/functions/object/2004.labyria_thunder/init/loop.mcfunction @@ -9,5 +9,5 @@ # 少し下げて判定 scoreboard players remove $2004.Temp Temporary 1 tp @s ~ ~-0.5 ~ ~ ~ - execute at @s if block ~ ~ ~ #lib:no_collision unless block ~ ~-0.5 ~ #lib:no_collision run scoreboard players set $2004.Temp Temporary -100 + execute at @s if block ~ ~ ~ #lib:no_collision/ unless block ~ ~-0.5 ~ #lib:no_collision/ run scoreboard players set $2004.Temp Temporary -100 execute at @s if score $2004.Temp Temporary matches 1.. run function asset:object/2004.labyria_thunder/init/loop diff --git a/Asset/data/asset/functions/object/2008.disaster_divine/tick/cast/loop.mcfunction b/Asset/data/asset/functions/object/2008.disaster_divine/tick/cast/loop.mcfunction index 92854de16ec..29270d3ca00 100644 --- a/Asset/data/asset/functions/object/2008.disaster_divine/tick/cast/loop.mcfunction +++ b/Asset/data/asset/functions/object/2008.disaster_divine/tick/cast/loop.mcfunction @@ -10,7 +10,7 @@ execute if predicate api:area/is_breakable unless block ^ ^ ^0.5 #lib:air unless block ^ ^ ^0.5 #lib:unbreakable run setblock ^ ^ ^0.5 air destroy # 着弾検知 - execute unless block ^ ^ ^0.5 #lib:no_collision run tag @s add 2008.Landing + execute unless block ^ ^ ^0.5 #lib:no_collision/ run tag @s add 2008.Landing # ターゲットにタグ付与 execute positioned ~-0.5 ~-0.5 ~-0.5 run tag @a[tag=!PlayerShouldInvulnerable,dx=0] add 2008.Landing diff --git a/Asset/data/asset/functions/object/2009.magic_bullet/tick/cast/loop.mcfunction b/Asset/data/asset/functions/object/2009.magic_bullet/tick/cast/loop.mcfunction index 4d5b1676b11..ce1d2dc0cbe 100644 --- a/Asset/data/asset/functions/object/2009.magic_bullet/tick/cast/loop.mcfunction +++ b/Asset/data/asset/functions/object/2009.magic_bullet/tick/cast/loop.mcfunction @@ -7,7 +7,7 @@ # asset:object/2009.magic_bullet/tick/cast/loop # 着弾検知 - execute unless block ^ ^ ^0.5 #lib:no_collision run tag @s add 2009.Landing + execute unless block ^ ^ ^0.5 #lib:no_collision/ run tag @s add 2009.Landing # ターゲットにタグ付与 execute positioned ~-0.5 ~-0.5 ~-0.5 run tag @a[tag=!PlayerShouldInvulnerable,dx=0] add 2009.Landing diff --git a/Asset/data/asset/functions/object/2010.hexa_laser/tick/beam/loop.mcfunction b/Asset/data/asset/functions/object/2010.hexa_laser/tick/beam/loop.mcfunction index bfc37fc7413..ae93310339d 100644 --- a/Asset/data/asset/functions/object/2010.hexa_laser/tick/beam/loop.mcfunction +++ b/Asset/data/asset/functions/object/2010.hexa_laser/tick/beam/loop.mcfunction @@ -8,7 +8,7 @@ # 着弾検知 execute positioned ~-0.5 ~-0.5 ~-0.5 if entity @p[tag=!PlayerShouldInvulnerable,dx=0] run tag @s add 2010.Landing - execute unless block ^ ^ ^0.5 #lib:no_collision run tag @s add 2010.Landing + execute unless block ^ ^ ^0.5 #lib:no_collision/ run tag @s add 2010.Landing # ターゲットにタグ付与 execute positioned ~-0.5 ~-0.5 ~-0.5 run tag @a[tag=!PlayerShouldInvulnerable,dx=0] add 2010.Landing diff --git a/Asset/data/asset/functions/object/2014.dimension_sword/init/.mcfunction b/Asset/data/asset/functions/object/2014.dimension_sword/init/.mcfunction index 46da0393e8a..9c1b70a0edf 100644 --- a/Asset/data/asset/functions/object/2014.dimension_sword/init/.mcfunction +++ b/Asset/data/asset/functions/object/2014.dimension_sword/init/.mcfunction @@ -18,7 +18,7 @@ # ループ処理 scoreboard players set $2014.Temp Temporary 16 - execute if block ~ ~ ~ #lib:no_collision unless block ~ ~-0.5 ~ #lib:no_collision run scoreboard players set $2014.Temp Temporary -100 + execute if block ~ ~ ~ #lib:no_collision/ unless block ~ ~-0.5 ~ #lib:no_collision/ run scoreboard players set $2014.Temp Temporary -100 execute at @s if score $2014.Temp Temporary matches 1.. run function asset:object/2014.dimension_sword/init/loop # ループしてもダメだったらキル diff --git a/Asset/data/asset/functions/object/2014.dimension_sword/init/loop.mcfunction b/Asset/data/asset/functions/object/2014.dimension_sword/init/loop.mcfunction index 712f6c9c149..cdbeaad2df2 100644 --- a/Asset/data/asset/functions/object/2014.dimension_sword/init/loop.mcfunction +++ b/Asset/data/asset/functions/object/2014.dimension_sword/init/loop.mcfunction @@ -9,5 +9,5 @@ # 少し下げて判定 scoreboard players remove $2014.Temp Temporary 1 tp @s ~ ~-0.5 ~ ~ ~ - execute at @s if block ~ ~ ~ #lib:no_collision unless block ~ ~-0.5 ~ #lib:no_collision run scoreboard players set $2014.Temp Temporary -100 + execute at @s if block ~ ~ ~ #lib:no_collision/ unless block ~ ~-0.5 ~ #lib:no_collision/ run scoreboard players set $2014.Temp Temporary -100 execute at @s if score $2014.Temp Temporary matches 1.. run function asset:object/2014.dimension_sword/init/loop diff --git a/Asset/data/asset/functions/object/2015.axia_shock_wave/init/.mcfunction b/Asset/data/asset/functions/object/2015.axia_shock_wave/init/.mcfunction index e67494c0cc2..a399f2a417a 100644 --- a/Asset/data/asset/functions/object/2015.axia_shock_wave/init/.mcfunction +++ b/Asset/data/asset/functions/object/2015.axia_shock_wave/init/.mcfunction @@ -18,7 +18,7 @@ # ループ処理 scoreboard players set $2015.Temp Temporary 16 - execute if block ~ ~ ~ #lib:no_collision unless block ~ ~-0.5 ~ #lib:no_collision run scoreboard players set $2015.Temp Temporary -100 + execute if block ~ ~ ~ #lib:no_collision/ unless block ~ ~-0.5 ~ #lib:no_collision/ run scoreboard players set $2015.Temp Temporary -100 execute at @s if score $2015.Temp Temporary matches 1.. run function asset:object/2015.axia_shock_wave/init/loop # ループしてもダメだったらキル diff --git a/Asset/data/asset/functions/object/2015.axia_shock_wave/init/loop.mcfunction b/Asset/data/asset/functions/object/2015.axia_shock_wave/init/loop.mcfunction index 8519c50f118..27f18fea21b 100644 --- a/Asset/data/asset/functions/object/2015.axia_shock_wave/init/loop.mcfunction +++ b/Asset/data/asset/functions/object/2015.axia_shock_wave/init/loop.mcfunction @@ -1,6 +1,6 @@ #> asset:object/2015.axia_shock_wave/init/loop # -# +# # # @within function # asset:object/2015.axia_shock_wave/init/ @@ -9,5 +9,5 @@ # 少し下げて判定 scoreboard players remove $2015.Temp Temporary 1 tp @s ~ ~-0.5 ~ ~ ~ - execute at @s if block ~ ~ ~ #lib:no_collision unless block ~ ~-0.5 ~ #lib:no_collision run scoreboard players set $2015.Temp Temporary -100 + execute at @s if block ~ ~ ~ #lib:no_collision/ unless block ~ ~-0.5 ~ #lib:no_collision/ run scoreboard players set $2015.Temp Temporary -100 execute at @s if score $2015.Temp Temporary matches 1.. run function asset:object/2015.axia_shock_wave/init/loop diff --git a/Asset/data/asset/functions/object/2016.axia_critical/init/.mcfunction b/Asset/data/asset/functions/object/2016.axia_critical/init/.mcfunction index 247fd0e87e9..0d3fd454013 100644 --- a/Asset/data/asset/functions/object/2016.axia_critical/init/.mcfunction +++ b/Asset/data/asset/functions/object/2016.axia_critical/init/.mcfunction @@ -18,7 +18,7 @@ # ループ処理 scoreboard players set $2016.Temp Temporary 16 - execute if block ~ ~ ~ #lib:no_collision unless block ~ ~-0.5 ~ #lib:no_collision run scoreboard players set $2016.Temp Temporary -100 + execute if block ~ ~ ~ #lib:no_collision/ unless block ~ ~-0.5 ~ #lib:no_collision/ run scoreboard players set $2016.Temp Temporary -100 execute at @s if score $2016.Temp Temporary matches 1.. run function asset:object/2016.axia_critical/init/loop # ループしてもダメだったらキル diff --git a/Asset/data/asset/functions/object/2016.axia_critical/init/loop.mcfunction b/Asset/data/asset/functions/object/2016.axia_critical/init/loop.mcfunction index 580c45bc006..39d9ef99f25 100644 --- a/Asset/data/asset/functions/object/2016.axia_critical/init/loop.mcfunction +++ b/Asset/data/asset/functions/object/2016.axia_critical/init/loop.mcfunction @@ -9,5 +9,5 @@ # 少し下げて判定 scoreboard players remove $2016.Temp Temporary 1 tp @s ~ ~-0.5 ~ ~ ~ - execute at @s if block ~ ~ ~ #lib:no_collision unless block ~ ~-0.5 ~ #lib:no_collision run scoreboard players set $2016.Temp Temporary -100 + execute at @s if block ~ ~ ~ #lib:no_collision/ unless block ~ ~-0.5 ~ #lib:no_collision/ run scoreboard players set $2016.Temp Temporary -100 execute at @s if score $2016.Temp Temporary matches 1.. run function asset:object/2016.axia_critical/init/loop diff --git a/Asset/data/asset/functions/object/2017.ecual_water_magic/init/.mcfunction b/Asset/data/asset/functions/object/2017.ecual_water_magic/init/.mcfunction index 4901638a62d..d465ea717d3 100644 --- a/Asset/data/asset/functions/object/2017.ecual_water_magic/init/.mcfunction +++ b/Asset/data/asset/functions/object/2017.ecual_water_magic/init/.mcfunction @@ -11,7 +11,7 @@ # ループ処理 scoreboard players set $2017.Temp Temporary 16 - execute if block ~ ~ ~ #lib:no_collision unless block ~ ~-0.5 ~ #lib:no_collision run scoreboard players set $2017.Temp Temporary -100 + execute if block ~ ~ ~ #lib:no_collision/ unless block ~ ~-0.5 ~ #lib:no_collision/ run scoreboard players set $2017.Temp Temporary -100 execute at @s if score $2017.Temp Temporary matches 1.. run function asset:object/2017.ecual_water_magic/init/loop # ループしてもダメだったらキル diff --git a/Asset/data/asset/functions/object/2017.ecual_water_magic/init/loop.mcfunction b/Asset/data/asset/functions/object/2017.ecual_water_magic/init/loop.mcfunction index f92f59525f7..939b3c2ca8e 100644 --- a/Asset/data/asset/functions/object/2017.ecual_water_magic/init/loop.mcfunction +++ b/Asset/data/asset/functions/object/2017.ecual_water_magic/init/loop.mcfunction @@ -9,5 +9,5 @@ # 少し下げて判定 scoreboard players remove $2017.Temp Temporary 1 tp @s ~ ~-0.5 ~ ~ ~ - execute at @s if block ~ ~ ~ #lib:no_collision unless block ~ ~-0.5 ~ #lib:no_collision run scoreboard players set $2017.Temp Temporary -100 + execute at @s if block ~ ~ ~ #lib:no_collision/ unless block ~ ~-0.5 ~ #lib:no_collision/ run scoreboard players set $2017.Temp Temporary -100 execute at @s if score $2017.Temp Temporary matches 1.. run function asset:object/2017.ecual_water_magic/init/loop diff --git a/Asset/data/asset/functions/object/2020.water_wall/init/.mcfunction b/Asset/data/asset/functions/object/2020.water_wall/init/.mcfunction index b9c3e332a38..77165cab1de 100644 --- a/Asset/data/asset/functions/object/2020.water_wall/init/.mcfunction +++ b/Asset/data/asset/functions/object/2020.water_wall/init/.mcfunction @@ -6,7 +6,7 @@ # ループ処理 scoreboard players set $2020.Temp Temporary 16 - execute if block ~ ~ ~ #lib:no_collision unless block ~ ~-0.5 ~ #lib:no_collision run scoreboard players set $2020.Temp Temporary -100 + execute if block ~ ~ ~ #lib:no_collision/ unless block ~ ~-0.5 ~ #lib:no_collision/ run scoreboard players set $2020.Temp Temporary -100 execute at @s if score $2020.Temp Temporary matches 1.. run function asset:object/2020.water_wall/init/loop # ループしてもダメだったらキル / 中断 diff --git a/Asset/data/asset/functions/object/2020.water_wall/init/loop.mcfunction b/Asset/data/asset/functions/object/2020.water_wall/init/loop.mcfunction index 897cf7252db..b589ead2888 100644 --- a/Asset/data/asset/functions/object/2020.water_wall/init/loop.mcfunction +++ b/Asset/data/asset/functions/object/2020.water_wall/init/loop.mcfunction @@ -9,5 +9,5 @@ # 少し下げて判定 scoreboard players remove $2020.Temp Temporary 1 tp @s ~ ~-0.5 ~ ~ ~ - execute at @s if block ~ ~ ~ #lib:no_collision unless block ~ ~-0.5 ~ #lib:no_collision run scoreboard players set $2020.Temp Temporary -100 + execute at @s if block ~ ~ ~ #lib:no_collision/ unless block ~ ~-0.5 ~ #lib:no_collision/ run scoreboard players set $2020.Temp Temporary -100 execute at @s if score $2020.Temp Temporary matches 1.. run function asset:object/2020.water_wall/init/loop diff --git a/Asset/data/asset/functions/object/2022.ecual_critical/init/.mcfunction b/Asset/data/asset/functions/object/2022.ecual_critical/init/.mcfunction index ef5f291f926..5e8cd52b593 100644 --- a/Asset/data/asset/functions/object/2022.ecual_critical/init/.mcfunction +++ b/Asset/data/asset/functions/object/2022.ecual_critical/init/.mcfunction @@ -6,7 +6,7 @@ # ループ処理 scoreboard players set $2022.Temp Temporary 16 - execute if block ~ ~ ~ #lib:no_collision unless block ~ ~-0.5 ~ #lib:no_collision run scoreboard players set $2022.Temp Temporary -100 + execute if block ~ ~ ~ #lib:no_collision/ unless block ~ ~-0.5 ~ #lib:no_collision/ run scoreboard players set $2022.Temp Temporary -100 execute at @s if score $2022.Temp Temporary matches 1.. run function asset:object/2022.ecual_critical/init/loop # ループしてもダメだったらキル diff --git a/Asset/data/asset/functions/object/2022.ecual_critical/init/loop.mcfunction b/Asset/data/asset/functions/object/2022.ecual_critical/init/loop.mcfunction index 674adff8995..4b8172f8210 100644 --- a/Asset/data/asset/functions/object/2022.ecual_critical/init/loop.mcfunction +++ b/Asset/data/asset/functions/object/2022.ecual_critical/init/loop.mcfunction @@ -9,5 +9,5 @@ # 少し下げて判定 scoreboard players remove $2022.Temp Temporary 1 tp @s ~ ~-0.5 ~ ~ ~ - execute at @s if block ~ ~ ~ #lib:no_collision unless block ~ ~-0.5 ~ #lib:no_collision run scoreboard players set $2022.Temp Temporary -100 + execute at @s if block ~ ~ ~ #lib:no_collision/ unless block ~ ~-0.5 ~ #lib:no_collision/ run scoreboard players set $2022.Temp Temporary -100 execute at @s if score $2022.Temp Temporary matches 1.. run function asset:object/2022.ecual_critical/init/loop diff --git a/Asset/data/asset/functions/object/2028.lastboss_meteor/init/recursive_down.mcfunction b/Asset/data/asset/functions/object/2028.lastboss_meteor/init/recursive_down.mcfunction index 52faee57f4b..f0773c32263 100644 --- a/Asset/data/asset/functions/object/2028.lastboss_meteor/init/recursive_down.mcfunction +++ b/Asset/data/asset/functions/object/2028.lastboss_meteor/init/recursive_down.mcfunction @@ -8,7 +8,7 @@ # asset:object/2028.lastboss_meteor/init/recursive_down # 下にずらして再帰 - execute if entity @s[distance=..64] if block ~ ~ ~ #lib:no_collision positioned ~ ~-1 ~ run function asset:object/2028.lastboss_meteor/init/recursive_down + execute if entity @s[distance=..64] if block ~ ~ ~ #lib:no_collision/ positioned ~ ~-1 ~ run function asset:object/2028.lastboss_meteor/init/recursive_down # ブロックだったらそこまで移動 - execute unless block ~ ~ ~ #lib:no_collision align xyz run tp @s ~0.5 ~1 ~0.5 + execute unless block ~ ~ ~ #lib:no_collision/ align xyz run tp @s ~0.5 ~1 ~0.5 diff --git a/Asset/data/asset/functions/object/2031.giant_pumpkin/detect_hit_block/check.mcfunction b/Asset/data/asset/functions/object/2031.giant_pumpkin/detect_hit_block/check.mcfunction index 8d0c531ccdb..bef83dccd8c 100644 --- a/Asset/data/asset/functions/object/2031.giant_pumpkin/detect_hit_block/check.mcfunction +++ b/Asset/data/asset/functions/object/2031.giant_pumpkin/detect_hit_block/check.mcfunction @@ -5,12 +5,12 @@ # @within function asset:object/2031.giant_pumpkin/detect_hit_block/ # 前方の縦3*横3をチェック - execute positioned ^ ^ ^1 unless block ~ ~ ~ #lib:no_collision run data modify storage asset:context IsHitBlock set value true - execute positioned ^1 ^ ^1 unless block ~ ~ ~ #lib:no_collision run data modify storage asset:context IsHitBlock set value true - execute positioned ^-1 ^ ^1 unless block ~ ~ ~ #lib:no_collision run data modify storage asset:context IsHitBlock set value true - execute positioned ^ ^1 ^1 unless block ~ ~ ~ #lib:no_collision run data modify storage asset:context IsHitBlock set value true - execute positioned ^1 ^1 ^1 unless block ~ ~ ~ #lib:no_collision run data modify storage asset:context IsHitBlock set value true - execute positioned ^-1 ^1 ^1 unless block ~ ~ ~ #lib:no_collision run data modify storage asset:context IsHitBlock set value true - execute positioned ^ ^-1 ^1 unless block ~ ~ ~ #lib:no_collision run data modify storage asset:context IsHitBlock set value true - execute positioned ^1 ^-1 ^1 unless block ~ ~ ~ #lib:no_collision run data modify storage asset:context IsHitBlock set value true - execute positioned ^-1 ^-1 ^1 unless block ~ ~ ~ #lib:no_collision run data modify storage asset:context IsHitBlock set value true + execute positioned ^ ^ ^1 unless block ~ ~ ~ #lib:no_collision/ run data modify storage asset:context IsHitBlock set value true + execute positioned ^1 ^ ^1 unless block ~ ~ ~ #lib:no_collision/ run data modify storage asset:context IsHitBlock set value true + execute positioned ^-1 ^ ^1 unless block ~ ~ ~ #lib:no_collision/ run data modify storage asset:context IsHitBlock set value true + execute positioned ^ ^1 ^1 unless block ~ ~ ~ #lib:no_collision/ run data modify storage asset:context IsHitBlock set value true + execute positioned ^1 ^1 ^1 unless block ~ ~ ~ #lib:no_collision/ run data modify storage asset:context IsHitBlock set value true + execute positioned ^-1 ^1 ^1 unless block ~ ~ ~ #lib:no_collision/ run data modify storage asset:context IsHitBlock set value true + execute positioned ^ ^-1 ^1 unless block ~ ~ ~ #lib:no_collision/ run data modify storage asset:context IsHitBlock set value true + execute positioned ^1 ^-1 ^1 unless block ~ ~ ~ #lib:no_collision/ run data modify storage asset:context IsHitBlock set value true + execute positioned ^-1 ^-1 ^1 unless block ~ ~ ~ #lib:no_collision/ run data modify storage asset:context IsHitBlock set value true diff --git a/Asset/data/asset/functions/object/2036.pumpkin_rain/detect_hit_block/.mcfunction b/Asset/data/asset/functions/object/2036.pumpkin_rain/detect_hit_block/.mcfunction index a4f6f916b3b..6b890040f49 100644 --- a/Asset/data/asset/functions/object/2036.pumpkin_rain/detect_hit_block/.mcfunction +++ b/Asset/data/asset/functions/object/2036.pumpkin_rain/detect_hit_block/.mcfunction @@ -5,4 +5,4 @@ # @within asset:object/alias/2036/detect_hit_block # 判定 - execute if entity @s[tag=!2036.OnGround] unless block ~ ~-1 ~ #lib:no_collision run data modify storage asset:context IsHitBlock set value true + execute if entity @s[tag=!2036.OnGround] unless block ~ ~-1 ~ #lib:no_collision/ run data modify storage asset:context IsHitBlock set value true diff --git a/Asset/data/asset/functions/object/2047.prominence_magic/detect_hit_block/.mcfunction b/Asset/data/asset/functions/object/2047.prominence_magic/detect_hit_block/.mcfunction index f572a9ac47f..3d4cc12b4a5 100644 --- a/Asset/data/asset/functions/object/2047.prominence_magic/detect_hit_block/.mcfunction +++ b/Asset/data/asset/functions/object/2047.prominence_magic/detect_hit_block/.mcfunction @@ -5,4 +5,4 @@ # @within asset:object/alias/2047/detect_hit_block # 着陸前のみ判定 - execute if entity @s[scores={General.Object.Tick=..79}] unless block ^ ^ ^0.5 #lib:no_collision run data modify storage asset:context IsHitBlock set value true + execute if entity @s[scores={General.Object.Tick=..79}] unless block ^ ^ ^0.5 #lib:no_collision/ run data modify storage asset:context IsHitBlock set value true diff --git a/Asset/data/asset/functions/object/2048.wave_magic/detect_hit_block/.mcfunction b/Asset/data/asset/functions/object/2048.wave_magic/detect_hit_block/.mcfunction index caddc5657c6..28ac974ecdd 100644 --- a/Asset/data/asset/functions/object/2048.wave_magic/detect_hit_block/.mcfunction +++ b/Asset/data/asset/functions/object/2048.wave_magic/detect_hit_block/.mcfunction @@ -5,6 +5,6 @@ # @within asset:object/alias/2048/detect_hit_block # 着陸前のヒット判定 - execute if entity @s[tag=!2048.OnGround] unless block ^ ^ ^0.5 #lib:no_collision run data modify storage asset:context IsHitBlock set value true + execute if entity @s[tag=!2048.OnGround] unless block ^ ^ ^0.5 #lib:no_collision/ run data modify storage asset:context IsHitBlock set value true # 着陸後のヒット判定はtickで行う diff --git a/Asset/data/asset/functions/object/2048.wave_magic/tick/on_ground.mcfunction b/Asset/data/asset/functions/object/2048.wave_magic/tick/on_ground.mcfunction index 4b6e0ee9a0e..91598463253 100644 --- a/Asset/data/asset/functions/object/2048.wave_magic/tick/on_ground.mcfunction +++ b/Asset/data/asset/functions/object/2048.wave_magic/tick/on_ground.mcfunction @@ -20,9 +20,9 @@ # 段差を超える処理 # 段差下に落ちる - execute at @s if block ^ ^ ^ #lib:no_collision if block ^ ^-0.33 ^ #lib:no_collision run tp @s ^ ^-0.4 ^ + execute at @s if block ^ ^ ^ #lib:no_collision/ if block ^ ^-0.33 ^ #lib:no_collision/ run tp @s ^ ^-0.4 ^ # 段差上に上る - execute at @s unless block ^ ^ ^ #lib:no_collision if block ^ ^1 ^ #lib:no_collision run tp @s ^ ^1 ^ + execute at @s unless block ^ ^ ^ #lib:no_collision/ if block ^ ^1 ^ #lib:no_collision/ run tp @s ^ ^1 ^ # 完全に阻まれたら消滅 - execute at @s unless block ^ ^ ^ #lib:no_collision unless block ^ ^0.4 ^ #lib:no_collision unless block ^ ^-0.4 ^ #lib:no_collision run kill @s + execute at @s unless block ^ ^ ^ #lib:no_collision/ unless block ^ ^0.4 ^ #lib:no_collision/ unless block ^ ^-0.4 ^ #lib:no_collision/ run kill @s diff --git a/Asset/data/asset/functions/object/2049.lightning_magic/detect_hit_block/.mcfunction b/Asset/data/asset/functions/object/2049.lightning_magic/detect_hit_block/.mcfunction index b7cd03dcabe..1e22b4525fb 100644 --- a/Asset/data/asset/functions/object/2049.lightning_magic/detect_hit_block/.mcfunction +++ b/Asset/data/asset/functions/object/2049.lightning_magic/detect_hit_block/.mcfunction @@ -5,8 +5,8 @@ # @within asset:object/alias/2049/detect_hit_block # 地面に着く前 - execute if entity @s[tag=!2049.OnGround] unless block ~ ~-0.5 ~ #lib:no_collision run data modify storage asset:context IsHitBlock set value true + execute if entity @s[tag=!2049.OnGround] unless block ~ ~-0.5 ~ #lib:no_collision/ run data modify storage asset:context IsHitBlock set value true # 地面に着いた後 # 雷雲が阻まれない限り消滅しない - execute if entity @s[tag=2049.OnGround] positioned ~ ~3 ~ unless block ^ ^ ^0.15 #lib:no_collision run data modify storage asset:context IsHitBlock set value true + execute if entity @s[tag=2049.OnGround] positioned ~ ~3 ~ unless block ^ ^ ^0.15 #lib:no_collision/ run data modify storage asset:context IsHitBlock set value true diff --git a/Asset/data/asset/functions/object/2067.watermelon/detect_hit_block/.mcfunction b/Asset/data/asset/functions/object/2067.watermelon/detect_hit_block/.mcfunction index b2bef2a688c..27f06acd4a7 100644 --- a/Asset/data/asset/functions/object/2067.watermelon/detect_hit_block/.mcfunction +++ b/Asset/data/asset/functions/object/2067.watermelon/detect_hit_block/.mcfunction @@ -5,4 +5,4 @@ # @within asset:object/alias/2067/detect_hit_block # 判定 - execute unless block ^ ^ ^0.5 #lib:no_collision run data modify storage asset:context IsHitBlock set value true + execute unless block ^ ^ ^0.5 #lib:no_collision/ run data modify storage asset:context IsHitBlock set value true diff --git a/Asset/data/asset/functions/object/2068.golden_watermelon/detect_hit_block/.mcfunction b/Asset/data/asset/functions/object/2068.golden_watermelon/detect_hit_block/.mcfunction index 6dc2d927ae7..b46cdd56db3 100644 --- a/Asset/data/asset/functions/object/2068.golden_watermelon/detect_hit_block/.mcfunction +++ b/Asset/data/asset/functions/object/2068.golden_watermelon/detect_hit_block/.mcfunction @@ -6,5 +6,5 @@ # 1回目の爆発の前のみ判定 # 埋まりにくいように2コマンド使って調整する - execute if entity @s[tag=!2068.1stHit] unless block ^ ^ ^0.5 #lib:no_collision run data modify storage asset:context IsHitBlock set value true - execute if entity @s[tag=!2068.1stHit] unless block ^ ^-0.4 ^0.5 #lib:no_collision run data modify storage asset:context IsHitBlock set value true + execute if entity @s[tag=!2068.1stHit] unless block ^ ^ ^0.5 #lib:no_collision/ run data modify storage asset:context IsHitBlock set value true + execute if entity @s[tag=!2068.1stHit] unless block ^ ^-0.4 ^0.5 #lib:no_collision/ run data modify storage asset:context IsHitBlock set value true diff --git a/Asset/data/asset/functions/object/2068.golden_watermelon/tick/.mcfunction b/Asset/data/asset/functions/object/2068.golden_watermelon/tick/.mcfunction index 6081402964e..411ad7648b8 100644 --- a/Asset/data/asset/functions/object/2068.golden_watermelon/tick/.mcfunction +++ b/Asset/data/asset/functions/object/2068.golden_watermelon/tick/.mcfunction @@ -14,7 +14,7 @@ execute if entity @s[tag=!2068.1stHit] at @s run function asset:object/super.tick # 1段目の爆発後なら一定tickまで落下 - execute if entity @s[tag=2068.1stHit] if block ~ ~-0.6 ~ #lib:no_collision run tp @s ~ ~-0.6 ~ + execute if entity @s[tag=2068.1stHit] if block ~ ~-0.6 ~ #lib:no_collision/ run tp @s ~ ~-0.6 ~ # 2段目爆発 execute if entity @s[scores={General.Object.Tick=35..}] run function asset:object/2068.golden_watermelon/tick/2nd_explode diff --git a/Asset/data/asset/functions/object/2079.orange/tick/.mcfunction b/Asset/data/asset/functions/object/2079.orange/tick/.mcfunction index 46551865b07..c84aaaf4a9a 100644 --- a/Asset/data/asset/functions/object/2079.orange/tick/.mcfunction +++ b/Asset/data/asset/functions/object/2079.orange/tick/.mcfunction @@ -11,9 +11,9 @@ particle dust 1 0.5 0 1 ~ ~ ~ 0.05 0.05 0.05 0 1 normal @a # 着地したときの処理 - execute if entity @s[tag=!2079.OnBlock] unless block ~ ~-0.3 ~ #lib:no_collision run scoreboard players set @s General.Object.Tick 201 - execute if entity @s[tag=!2079.OnBlock] unless block ~ ~-0.3 ~ #lib:no_collision run data modify entity @s NoGravity set value true - execute if entity @s[tag=!2079.OnBlock] unless block ~ ~-0.3 ~ #lib:no_collision run tag @s add 2079.OnBlock + execute if entity @s[tag=!2079.OnBlock] unless block ~ ~-0.3 ~ #lib:no_collision/ run scoreboard players set @s General.Object.Tick 201 + execute if entity @s[tag=!2079.OnBlock] unless block ~ ~-0.3 ~ #lib:no_collision/ run data modify entity @s NoGravity set value true + execute if entity @s[tag=!2079.OnBlock] unless block ~ ~-0.3 ~ #lib:no_collision/ run tag @s add 2079.OnBlock # 着地後の処理 execute if entity @s[tag=2079.OnBlock] run function asset:object/2079.orange/tick/on_block diff --git a/Asset/data/asset/functions/object/2080.aurora_missile/detect_hit_block/.mcfunction b/Asset/data/asset/functions/object/2080.aurora_missile/detect_hit_block/.mcfunction index ed53f7722f4..a0464dc502b 100644 --- a/Asset/data/asset/functions/object/2080.aurora_missile/detect_hit_block/.mcfunction +++ b/Asset/data/asset/functions/object/2080.aurora_missile/detect_hit_block/.mcfunction @@ -5,5 +5,5 @@ # @within asset:object/alias/2080/detect_hit_block # 判定 - execute if entity @s[tag=!2080.Enhanced] unless block ^ ^ ^0.5 #lib:no_collision run data modify storage asset:context IsHitBlock set value true - execute if entity @s[tag=2080.Enhanced] unless block ^ ^ ^0.7 #lib:no_collision run data modify storage asset:context IsHitBlock set value true + execute if entity @s[tag=!2080.Enhanced] unless block ^ ^ ^0.5 #lib:no_collision/ run data modify storage asset:context IsHitBlock set value true + execute if entity @s[tag=2080.Enhanced] unless block ^ ^ ^0.7 #lib:no_collision/ run data modify storage asset:context IsHitBlock set value true diff --git a/Asset/data/asset/functions/object/2093.tutankhamen_death/tick/.mcfunction b/Asset/data/asset/functions/object/2093.tutankhamen_death/tick/.mcfunction index 9859ecae8d2..27c51978d67 100644 --- a/Asset/data/asset/functions/object/2093.tutankhamen_death/tick/.mcfunction +++ b/Asset/data/asset/functions/object/2093.tutankhamen_death/tick/.mcfunction @@ -22,4 +22,4 @@ execute if score @s General.Object.Tick matches 110 run function asset:object/2093.tutankhamen_death/tick/end # 足元に何もなければ - execute if block ~ ~-0.2 ~ #lib:no_collision run particle minecraft:enchant ~ ~ ~ 0.4 0 0.4 0 10 + execute if block ~ ~-0.2 ~ #lib:no_collision/ run particle minecraft:enchant ~ ~ ~ 0.4 0 0.4 0 10 diff --git a/Asset/data/asset/functions/object/2110.heiloang_heavenly_spike/tick/.mcfunction b/Asset/data/asset/functions/object/2110.heiloang_heavenly_spike/tick/.mcfunction index 00c4ba6b956..5d1b229ff12 100644 --- a/Asset/data/asset/functions/object/2110.heiloang_heavenly_spike/tick/.mcfunction +++ b/Asset/data/asset/functions/object/2110.heiloang_heavenly_spike/tick/.mcfunction @@ -13,8 +13,8 @@ # 移動 execute if entity @s[scores={General.Object.Tick=80..}] run tp @s ~ ~-1 ~ - execute unless block ~ ~-4 ~ #lib:no_collision run function asset:object/2110.heiloang_heavenly_spike/tick/summon_vfx - execute unless block ~ ~-1 ~ #lib:no_collision run function asset:object/2110.heiloang_heavenly_spike/tick/damage + execute unless block ~ ~-4 ~ #lib:no_collision/ run function asset:object/2110.heiloang_heavenly_spike/tick/summon_vfx + execute unless block ~ ~-1 ~ #lib:no_collision/ run function asset:object/2110.heiloang_heavenly_spike/tick/damage # 消滅処理 kill @s[scores={General.Object.Tick=300..}] diff --git a/Asset/data/asset/functions/object/2119.heiloang_wind_burst/tick/.mcfunction b/Asset/data/asset/functions/object/2119.heiloang_wind_burst/tick/.mcfunction index e692fb13a13..b5377498021 100644 --- a/Asset/data/asset/functions/object/2119.heiloang_wind_burst/tick/.mcfunction +++ b/Asset/data/asset/functions/object/2119.heiloang_wind_burst/tick/.mcfunction @@ -13,7 +13,7 @@ # 移動 execute if entity @s[scores={General.Object.Tick=30..}] run tp @s ~ ~-1 ~ - execute unless block ~ ~-1 ~ #lib:no_collision run function asset:object/2119.heiloang_wind_burst/tick/damage + execute unless block ~ ~-1 ~ #lib:no_collision/ run function asset:object/2119.heiloang_wind_burst/tick/damage # 消滅処理 kill @s[scores={General.Object.Tick=1000..}] diff --git a/Asset/data/asset/functions/object/2124.heiloang_fire_burst/tick/.mcfunction b/Asset/data/asset/functions/object/2124.heiloang_fire_burst/tick/.mcfunction index c6fa83f93ab..43f875e231f 100644 --- a/Asset/data/asset/functions/object/2124.heiloang_fire_burst/tick/.mcfunction +++ b/Asset/data/asset/functions/object/2124.heiloang_fire_burst/tick/.mcfunction @@ -16,7 +16,7 @@ # 移動 execute if entity @s[scores={General.Object.Tick=70..}] run tp @s ~ ~-3 ~ - # execute unless block ~ ~-1 ~ #lib:no_collision run function asset:object/2124.heiloang_fire_burst/tick/damage + # execute unless block ~ ~-1 ~ #lib:no_collision/ run function asset:object/2124.heiloang_fire_burst/tick/damage execute if entity @s[scores={General.Object.Tick=80..}] positioned ~ ~1.5 ~ run function asset:object/2124.heiloang_fire_burst/tick/damage # 消滅処理 diff --git a/Asset/data/asset/functions/object/2125.heiloang_ice_burst/tick/.mcfunction b/Asset/data/asset/functions/object/2125.heiloang_ice_burst/tick/.mcfunction index 08e76c9f130..bf619f53851 100644 --- a/Asset/data/asset/functions/object/2125.heiloang_ice_burst/tick/.mcfunction +++ b/Asset/data/asset/functions/object/2125.heiloang_ice_burst/tick/.mcfunction @@ -14,7 +14,7 @@ # 移動 # execute if entity @s[scores={General.Object.Tick=30..}] run tp @s ~ ~-1 ~ - # execute unless block ~ ~-1 ~ #lib:no_collision run function asset:object/2125.heiloang_ice_burst/tick/damage + # execute unless block ~ ~-1 ~ #lib:no_collision/ run function asset:object/2125.heiloang_ice_burst/tick/damage execute if entity @s[scores={General.Object.Tick=45..}] run tp @s ~ ~-2 ~ execute if entity @s[scores={General.Object.Tick=60..}] positioned ~ ~0.5 ~ run function asset:object/2125.heiloang_ice_burst/tick/damage diff --git a/Asset/data/asset/functions/object/2136.blazing_bomb/kill/.mcfunction b/Asset/data/asset/functions/object/2136.blazing_bomb/kill/.mcfunction index d45b370a142..e53b775608a 100644 --- a/Asset/data/asset/functions/object/2136.blazing_bomb/kill/.mcfunction +++ b/Asset/data/asset/functions/object/2136.blazing_bomb/kill/.mcfunction @@ -33,7 +33,7 @@ function api:damage/reset # 下が地面であれば、座標にアラインして実行 - execute at @s align xyz positioned ~-0.5 ~1 ~-0.5 if block ~ ~ ~ #lib:no_collision run function asset:object/2136.blazing_bomb/kill/place_aoe + execute at @s align xyz positioned ~-0.5 ~1 ~-0.5 if block ~ ~ ~ #lib:no_collision/ run function asset:object/2136.blazing_bomb/kill/place_aoe # 消失 kill @s diff --git a/Asset/data/asset/functions/object/2139.louvert_fire_magic/init/.mcfunction b/Asset/data/asset/functions/object/2139.louvert_fire_magic/init/.mcfunction index 86942c6fb12..beee7d17b3f 100644 --- a/Asset/data/asset/functions/object/2139.louvert_fire_magic/init/.mcfunction +++ b/Asset/data/asset/functions/object/2139.louvert_fire_magic/init/.mcfunction @@ -6,7 +6,7 @@ # ループ処理 scoreboard players set $2139.Temp Temporary 16 - execute if block ~ ~ ~ #lib:no_collision unless block ~ ~-0.5 ~ #lib:no_collision run scoreboard players set $2139.Temp Temporary -100 + execute if block ~ ~ ~ #lib:no_collision/ unless block ~ ~-0.5 ~ #lib:no_collision/ run scoreboard players set $2139.Temp Temporary -100 execute if score $2139.Temp Temporary matches 1.. run function asset:object/2139.louvert_fire_magic/init/loop # ループしてもダメだったらキル diff --git a/Asset/data/asset/functions/object/2139.louvert_fire_magic/init/loop.mcfunction b/Asset/data/asset/functions/object/2139.louvert_fire_magic/init/loop.mcfunction index 89ac3e1b083..170bd362cb7 100644 --- a/Asset/data/asset/functions/object/2139.louvert_fire_magic/init/loop.mcfunction +++ b/Asset/data/asset/functions/object/2139.louvert_fire_magic/init/loop.mcfunction @@ -9,5 +9,5 @@ # 少し下げて判定 scoreboard players remove $2139.Temp Temporary 1 tp @s ~ ~-0.25 ~ ~ ~ - execute at @s if block ~ ~ ~ #lib:no_collision unless block ~ ~-0.5 ~ #lib:no_collision run scoreboard players set $2139.Temp Temporary -100 + execute at @s if block ~ ~ ~ #lib:no_collision/ unless block ~ ~-0.5 ~ #lib:no_collision/ run scoreboard players set $2139.Temp Temporary -100 execute at @s if score $2139.Temp Temporary matches 1.. run function asset:object/2139.louvert_fire_magic/init/loop diff --git a/Asset/data/asset/functions/object/2140.louvert_meteor/init/.mcfunction b/Asset/data/asset/functions/object/2140.louvert_meteor/init/.mcfunction index 55e0b27712a..23bf9d0ffcd 100644 --- a/Asset/data/asset/functions/object/2140.louvert_meteor/init/.mcfunction +++ b/Asset/data/asset/functions/object/2140.louvert_meteor/init/.mcfunction @@ -6,7 +6,7 @@ # ループ処理 scoreboard players set $2140.Temp Temporary 32 - execute if block ~ ~ ~ #lib:no_collision unless block ~ ~-0.25 ~ #lib:no_collision run scoreboard players set $2140.Temp Temporary -100 + execute if block ~ ~ ~ #lib:no_collision/ unless block ~ ~-0.25 ~ #lib:no_collision/ run scoreboard players set $2140.Temp Temporary -100 execute if score $2140.Temp Temporary matches 1.. run function asset:object/2140.louvert_meteor/init/loop # ループしてもダメだったらキル & return diff --git a/Asset/data/asset/functions/object/2140.louvert_meteor/init/loop.mcfunction b/Asset/data/asset/functions/object/2140.louvert_meteor/init/loop.mcfunction index 6fbe06d4a35..fd8bde93e97 100644 --- a/Asset/data/asset/functions/object/2140.louvert_meteor/init/loop.mcfunction +++ b/Asset/data/asset/functions/object/2140.louvert_meteor/init/loop.mcfunction @@ -9,5 +9,5 @@ # 少し下げて判定 scoreboard players remove $2140.Temp Temporary 1 tp @s ~ ~-0.25 ~ ~ ~ - execute at @s if block ~ ~ ~ #lib:no_collision unless block ~ ~-0.25 ~ #lib:no_collision run scoreboard players set $2140.Temp Temporary -100 + execute at @s if block ~ ~ ~ #lib:no_collision/ unless block ~ ~-0.25 ~ #lib:no_collision/ run scoreboard players set $2140.Temp Temporary -100 execute at @s if score $2140.Temp Temporary matches 1.. run function asset:object/2140.louvert_meteor/init/loop diff --git a/Asset/data/asset/functions/object/2143.louvert_soul_quake/init/.mcfunction b/Asset/data/asset/functions/object/2143.louvert_soul_quake/init/.mcfunction index 13e270b3d08..f29e10e7206 100644 --- a/Asset/data/asset/functions/object/2143.louvert_soul_quake/init/.mcfunction +++ b/Asset/data/asset/functions/object/2143.louvert_soul_quake/init/.mcfunction @@ -6,7 +6,7 @@ # ループ処理 scoreboard players set $2143.Temp Temporary 16 - execute if block ~ ~ ~ #lib:no_collision unless block ~ ~-0.5 ~ #lib:no_collision run scoreboard players set $2143.Temp Temporary -100 + execute if block ~ ~ ~ #lib:no_collision/ unless block ~ ~-0.5 ~ #lib:no_collision/ run scoreboard players set $2143.Temp Temporary -100 execute if score $2143.Temp Temporary matches 1.. run function asset:object/2143.louvert_soul_quake/init/loop # ループしてもダメだったらキル diff --git a/Asset/data/asset/functions/object/2143.louvert_soul_quake/init/loop.mcfunction b/Asset/data/asset/functions/object/2143.louvert_soul_quake/init/loop.mcfunction index 5a8044f6161..e2cc8dc35d4 100644 --- a/Asset/data/asset/functions/object/2143.louvert_soul_quake/init/loop.mcfunction +++ b/Asset/data/asset/functions/object/2143.louvert_soul_quake/init/loop.mcfunction @@ -9,5 +9,5 @@ # 少し下げて判定 scoreboard players remove $2143.Temp Temporary 1 tp @s ~ ~-0.25 ~ ~ ~ - execute at @s if block ~ ~ ~ #lib:no_collision unless block ~ ~-0.5 ~ #lib:no_collision run scoreboard players set $2143.Temp Temporary -100 + execute at @s if block ~ ~ ~ #lib:no_collision/ unless block ~ ~-0.5 ~ #lib:no_collision/ run scoreboard players set $2143.Temp Temporary -100 execute at @s if score $2143.Temp Temporary matches 1.. run function asset:object/2143.louvert_soul_quake/init/loop diff --git a/Asset/data/asset/functions/object/2153.haruclaire_thrown_rod/tick/move.mcfunction b/Asset/data/asset/functions/object/2153.haruclaire_thrown_rod/tick/move.mcfunction index d43cc544c7e..86eb2583e6e 100644 --- a/Asset/data/asset/functions/object/2153.haruclaire_thrown_rod/tick/move.mcfunction +++ b/Asset/data/asset/functions/object/2153.haruclaire_thrown_rod/tick/move.mcfunction @@ -16,7 +16,7 @@ execute if entity @s[tag=2153.Inverse,scores={General.Object.Tick=30..40}] at @s run tp @s ^ ^ ^ ~ ~-1 # ブロックに衝突する場合、軌道修正 - execute at @s unless block ^ ^ ^0.5 #lib:no_collision run tp @s ^ ^ ^-0.5 ~ -1 + execute at @s unless block ^ ^ ^0.5 #lib:no_collision/ run tp @s ^ ^ ^-0.5 ~ -1 # 攻撃 execute at @s if entity @a[tag=!PlayerShouldInvulnerable,distance=..2] if score @s 2153.CoolTime matches ..0 run function asset:object/2153.haruclaire_thrown_rod/tick/attack diff --git a/Asset/data/asset/functions/object/2156.haruclaire_icepillar/tick/.mcfunction b/Asset/data/asset/functions/object/2156.haruclaire_icepillar/tick/.mcfunction index 9b992e4c30b..63b7fe8dcb1 100644 --- a/Asset/data/asset/functions/object/2156.haruclaire_icepillar/tick/.mcfunction +++ b/Asset/data/asset/functions/object/2156.haruclaire_icepillar/tick/.mcfunction @@ -15,7 +15,7 @@ # 移動 execute if entity @s[tag=!2156.StartAttack,scores={General.Object.Tick=20..}] run function asset:object/2156.haruclaire_icepillar/tick/move - execute if entity @s[tag=!2156.StartAttack,scores={General.Object.Tick=20..}] at @s unless block ~ ~-3.2 ~ #lib:no_collision run function asset:object/2156.haruclaire_icepillar/tick/set_ground + execute if entity @s[tag=!2156.StartAttack,scores={General.Object.Tick=20..}] at @s unless block ~ ~-3.2 ~ #lib:no_collision/ run function asset:object/2156.haruclaire_icepillar/tick/set_ground execute if entity @s[tag=2156.Right,scores={General.Object.Tick=12..}] on passengers if entity @s[tag=2156.Append,tag=!2156.Prediction] at @s run tp @s ~ ~ ~ ~3 ~ execute if entity @s[tag=!2156.Right,scores={General.Object.Tick=12..}] on passengers if entity @s[tag=2156.Append,tag=!2156.Prediction] at @s run tp @s ~ ~ ~ ~-3 ~ diff --git a/Asset/data/asset/functions/object/2156.haruclaire_icepillar/tick/move.mcfunction b/Asset/data/asset/functions/object/2156.haruclaire_icepillar/tick/move.mcfunction index 89084a0b3b0..335571f7774 100644 --- a/Asset/data/asset/functions/object/2156.haruclaire_icepillar/tick/move.mcfunction +++ b/Asset/data/asset/functions/object/2156.haruclaire_icepillar/tick/move.mcfunction @@ -5,8 +5,8 @@ # @within asset:object/2156.haruclaire_icepillar/tick/ # 移動 - execute at @s if block ~ ~-3.2 ~ #lib:no_collision run tp @s ~ ~-0.1 ~ - execute at @s if block ~ ~-3.2 ~ #lib:no_collision run tp @s ~ ~-0.1 ~ - execute at @s if block ~ ~-3.2 ~ #lib:no_collision run tp @s ~ ~-0.1 ~ - execute at @s if block ~ ~-3.2 ~ #lib:no_collision run tp @s ~ ~-0.1 ~ - execute at @s if block ~ ~-3.2 ~ #lib:no_collision run tp @s ~ ~-0.1 ~ + execute at @s if block ~ ~-3.2 ~ #lib:no_collision/ run tp @s ~ ~-0.1 ~ + execute at @s if block ~ ~-3.2 ~ #lib:no_collision/ run tp @s ~ ~-0.1 ~ + execute at @s if block ~ ~-3.2 ~ #lib:no_collision/ run tp @s ~ ~-0.1 ~ + execute at @s if block ~ ~-3.2 ~ #lib:no_collision/ run tp @s ~ ~-0.1 ~ + execute at @s if block ~ ~-3.2 ~ #lib:no_collision/ run tp @s ~ ~-0.1 ~ diff --git a/Asset/data/asset/functions/object/2170.astro_teleport/init/.mcfunction b/Asset/data/asset/functions/object/2170.astro_teleport/init/.mcfunction index ac826148922..fa57717be26 100644 --- a/Asset/data/asset/functions/object/2170.astro_teleport/init/.mcfunction +++ b/Asset/data/asset/functions/object/2170.astro_teleport/init/.mcfunction @@ -6,7 +6,7 @@ # ブロックの直上に来るようにループ処理を行う scoreboard players set $2170.Temp Temporary 32 - execute if block ~ ~ ~ #lib:no_collision unless block ~ ~-0.25 ~ #lib:no_collision run scoreboard players set $2170.Temp Temporary -100 + execute if block ~ ~ ~ #lib:no_collision/ unless block ~ ~-0.25 ~ #lib:no_collision/ run scoreboard players set $2170.Temp Temporary -100 execute if score $2170.Temp Temporary matches 1.. run function asset:object/2170.astro_teleport/init/loop # ループしてもダメだったらキル diff --git a/Asset/data/asset/functions/object/2170.astro_teleport/init/loop.mcfunction b/Asset/data/asset/functions/object/2170.astro_teleport/init/loop.mcfunction index b2a1c88c77a..56fbc0c9d1d 100644 --- a/Asset/data/asset/functions/object/2170.astro_teleport/init/loop.mcfunction +++ b/Asset/data/asset/functions/object/2170.astro_teleport/init/loop.mcfunction @@ -9,5 +9,5 @@ # 少し下げて判定 scoreboard players remove $2170.Temp Temporary 1 tp @s ~ ~-0.25 ~ ~ ~ - execute at @s if block ~ ~ ~ #lib:no_collision unless block ~ ~-0.25 ~ #lib:no_collision run scoreboard players set $2170.Temp Temporary -100 + execute at @s if block ~ ~ ~ #lib:no_collision/ unless block ~ ~-0.25 ~ #lib:no_collision/ run scoreboard players set $2170.Temp Temporary -100 execute at @s if score $2170.Temp Temporary matches 1.. run function asset:object/2170.astro_teleport/init/loop diff --git a/Asset/data/asset/functions/object/2176.tiamat_darkbreath/tick/prediction.mcfunction b/Asset/data/asset/functions/object/2176.tiamat_darkbreath/tick/prediction.mcfunction index 23be7385ed3..0f293178273 100644 --- a/Asset/data/asset/functions/object/2176.tiamat_darkbreath/tick/prediction.mcfunction +++ b/Asset/data/asset/functions/object/2176.tiamat_darkbreath/tick/prediction.mcfunction @@ -5,7 +5,7 @@ # @within asset:object/2176.tiamat_darkbreath/tick/ # 地面が無ければ消す - execute if block ~ ~ ~ #lib:no_collision run return run kill @s + execute if block ~ ~ ~ #lib:no_collision/ run return run kill @s # 予告 tp @s ~ ~ ~ ~ 0 diff --git a/Asset/data/asset/functions/object/2178.tiamat_icicledive/tick/effect.mcfunction b/Asset/data/asset/functions/object/2178.tiamat_icicledive/tick/effect.mcfunction index 1a83da77376..5c09e5d17b3 100644 --- a/Asset/data/asset/functions/object/2178.tiamat_icicledive/tick/effect.mcfunction +++ b/Asset/data/asset/functions/object/2178.tiamat_icicledive/tick/effect.mcfunction @@ -5,7 +5,7 @@ # @within asset:object/2178.tiamat_icicledive/tick/damage # 地面が無ければ消す - execute if block ~ ~ ~ #lib:no_collision if block ~ ~-1 ~ #lib:no_collision if block ~ ~-2 ~ #lib:no_collision run return run kill @s + execute if block ~ ~ ~ #lib:no_collision/ if block ~ ~-1 ~ #lib:no_collision/ if block ~ ~-2 ~ #lib:no_collision/ run return run kill @s # 演出 particle cloud ~ ~1 ~ 2 2 2 0.1 6 diff --git a/Asset/data/asset/functions/object/2185.heiloang_storm_burst/tick/.mcfunction b/Asset/data/asset/functions/object/2185.heiloang_storm_burst/tick/.mcfunction index e964873a8d1..2d4cc56865a 100644 --- a/Asset/data/asset/functions/object/2185.heiloang_storm_burst/tick/.mcfunction +++ b/Asset/data/asset/functions/object/2185.heiloang_storm_burst/tick/.mcfunction @@ -13,7 +13,7 @@ # 移動 execute if entity @s[scores={General.Object.Tick=30..199}] run tp @s ~ ~-1 ~ - execute if entity @s[scores={General.Object.Tick=..199}] unless block ~ ~-2 ~ #lib:no_collision run function asset:object/2185.heiloang_storm_burst/tick/damage + execute if entity @s[scores={General.Object.Tick=..199}] unless block ~ ~-2 ~ #lib:no_collision/ run function asset:object/2185.heiloang_storm_burst/tick/damage # 竜巻演出 execute if entity @s[scores={General.Object.Tick=201..358}] run tp @s ~ ~ ~ ~-30 ~ diff --git a/Asset/data/asset/functions/object/2195.eclael_death_animation/tick/event.mcfunction b/Asset/data/asset/functions/object/2195.eclael_death_animation/tick/event.mcfunction index 51ce31df6c9..81e75d3a3d8 100644 --- a/Asset/data/asset/functions/object/2195.eclael_death_animation/tick/event.mcfunction +++ b/Asset/data/asset/functions/object/2195.eclael_death_animation/tick/event.mcfunction @@ -11,9 +11,9 @@ execute if score @s General.Object.Tick matches 1 run function animated_java:eclael/animations/30_0_phase_death/tween {duration:1, to_frame: 1} # 移動 - execute if score @s General.Object.Tick matches 1..15 at @s positioned ^ ^ ^-0.1 if block ~ ~ ~ #lib:no_collision run tp @s ~ ~ ~ ~ ~ - execute if score @s General.Object.Tick matches 1..15 at @s positioned ^ ^-0.1 ^ if block ~ ~ ~ #lib:no_collision run tp @s ~ ~ ~ ~ ~ - execute if score @s General.Object.Tick matches 54..85 at @s positioned ^ ^0.04 ^ if block ~ ~ ~ #lib:no_collision run tp @s ~ ~ ~ ~ ~ + execute if score @s General.Object.Tick matches 1..15 at @s positioned ^ ^ ^-0.1 if block ~ ~ ~ #lib:no_collision/ run tp @s ~ ~ ~ ~ ~ + execute if score @s General.Object.Tick matches 1..15 at @s positioned ^ ^-0.1 ^ if block ~ ~ ~ #lib:no_collision/ run tp @s ~ ~ ~ ~ ~ + execute if score @s General.Object.Tick matches 54..85 at @s positioned ^ ^0.04 ^ if block ~ ~ ~ #lib:no_collision/ run tp @s ~ ~ ~ ~ ~ # 効果音 execute if score @s General.Object.Tick matches 1 run function animated_java:eclael/variants/blink/apply diff --git a/Asset/data/asset/functions/object/2200.twins_escape_animation/tick/event_rubiel.mcfunction b/Asset/data/asset/functions/object/2200.twins_escape_animation/tick/event_rubiel.mcfunction index 076bcabab6b..f4b36dc238c 100644 --- a/Asset/data/asset/functions/object/2200.twins_escape_animation/tick/event_rubiel.mcfunction +++ b/Asset/data/asset/functions/object/2200.twins_escape_animation/tick/event_rubiel.mcfunction @@ -11,7 +11,7 @@ execute if score @s General.Object.Tick matches 1 run function animated_java:twins_rubiel/animations/42_escape/tween {duration:1, to_frame: 1} # 移動 - execute if block ~ ~-0.1 ~ #lib:no_collision run tp @s ~ ~-0.1 ~ + execute if block ~ ~-0.1 ~ #lib:no_collision/ run tp @s ~ ~-0.1 ~ # 演出 execute if score @s General.Object.Tick matches 59 run playsound entity.phantom.flap hostile @a ~ ~ ~ 3 1.2 diff --git a/Asset/data/asset/functions/object/2200.twins_escape_animation/tick/event_sapphiel.mcfunction b/Asset/data/asset/functions/object/2200.twins_escape_animation/tick/event_sapphiel.mcfunction index c9f995bc6a4..d282a724aad 100644 --- a/Asset/data/asset/functions/object/2200.twins_escape_animation/tick/event_sapphiel.mcfunction +++ b/Asset/data/asset/functions/object/2200.twins_escape_animation/tick/event_sapphiel.mcfunction @@ -11,7 +11,7 @@ execute if score @s General.Object.Tick matches 1 run function animated_java:twins_sapphiel/animations/42_escape/tween {duration:1, to_frame: 1} # 移動 - execute if block ~ ~-0.1 ~ #lib:no_collision run tp @s ~ ~-0.1 ~ + execute if block ~ ~-0.1 ~ #lib:no_collision/ run tp @s ~ ~-0.1 ~ # 演出 execute if score @s General.Object.Tick matches 59 run playsound entity.phantom.flap hostile @a ~ ~ ~ 3 1.2 diff --git a/Asset/data/asset/functions/object/2212.eclael_upper_shot/tick/effect.mcfunction b/Asset/data/asset/functions/object/2212.eclael_upper_shot/tick/effect.mcfunction index 82a2e543aac..0f563e819aa 100644 --- a/Asset/data/asset/functions/object/2212.eclael_upper_shot/tick/effect.mcfunction +++ b/Asset/data/asset/functions/object/2212.eclael_upper_shot/tick/effect.mcfunction @@ -5,7 +5,7 @@ # @within asset:object/2212.eclael_upper_shot/tick/ # 床が無い場合スキップ - # execute if block ~ ~-1 ~ #lib:no_collision run return run kill @s + # execute if block ~ ~-1 ~ #lib:no_collision/ run return run kill @s # 演出 playsound entity.arrow.hit hostile @a ~ ~ ~ 1 1 diff --git a/Asset/data/asset/functions/object/2218.karmic_conviction_shot/tick/check_forward_block.mcfunction b/Asset/data/asset/functions/object/2218.karmic_conviction_shot/tick/check_forward_block.mcfunction index bc8ab3f316e..3f94b53e900 100644 --- a/Asset/data/asset/functions/object/2218.karmic_conviction_shot/tick/check_forward_block.mcfunction +++ b/Asset/data/asset/functions/object/2218.karmic_conviction_shot/tick/check_forward_block.mcfunction @@ -5,4 +5,4 @@ # @within function asset:object/2218.karmic_conviction_shot/tick/ # 前方に壁があればMovePerStepを0に - $execute unless block ^ ^ ^$(MovePerStep) #lib:no_collision run data modify storage asset:context this.MovePerStep set value 0 + $execute unless block ^ ^ ^$(MovePerStep) #lib:no_collision/ run data modify storage asset:context this.MovePerStep set value 0 diff --git a/Asset/data/asset/functions/object/2221.aurora_scaffold/init/.mcfunction b/Asset/data/asset/functions/object/2221.aurora_scaffold/init/.mcfunction index e1d960eaf67..80ed175a68c 100644 --- a/Asset/data/asset/functions/object/2221.aurora_scaffold/init/.mcfunction +++ b/Asset/data/asset/functions/object/2221.aurora_scaffold/init/.mcfunction @@ -25,15 +25,15 @@ # 3x3の範囲がそれぞれブロックでなければ水色のステンドグラスを設置 # 設置できたかどうかを記録 - execute at @s positioned ~00 ~00 ~00 store success storage asset:context this.CheckBreak.1 byte 1 if block ~ ~ ~ #lib:no_collision_without_fluid run setblock ~ ~ ~ cyan_stained_glass - execute at @s positioned ~01 ~00 ~00 store success storage asset:context this.CheckBreak.2 byte 1 if block ~ ~ ~ #lib:no_collision_without_fluid run setblock ~ ~ ~ cyan_stained_glass - execute at @s positioned ~01 ~00 ~01 store success storage asset:context this.CheckBreak.3 byte 1 if block ~ ~ ~ #lib:no_collision_without_fluid run setblock ~ ~ ~ cyan_stained_glass - execute at @s positioned ~01 ~00 ~-1 store success storage asset:context this.CheckBreak.4 byte 1 if block ~ ~ ~ #lib:no_collision_without_fluid run setblock ~ ~ ~ cyan_stained_glass - execute at @s positioned ~-1 ~00 ~00 store success storage asset:context this.CheckBreak.5 byte 1 if block ~ ~ ~ #lib:no_collision_without_fluid run setblock ~ ~ ~ cyan_stained_glass - execute at @s positioned ~-1 ~00 ~01 store success storage asset:context this.CheckBreak.6 byte 1 if block ~ ~ ~ #lib:no_collision_without_fluid run setblock ~ ~ ~ cyan_stained_glass - execute at @s positioned ~-1 ~00 ~-1 store success storage asset:context this.CheckBreak.7 byte 1 if block ~ ~ ~ #lib:no_collision_without_fluid run setblock ~ ~ ~ cyan_stained_glass - execute at @s positioned ~00 ~00 ~01 store success storage asset:context this.CheckBreak.8 byte 1 if block ~ ~ ~ #lib:no_collision_without_fluid run setblock ~ ~ ~ cyan_stained_glass - execute at @s positioned ~00 ~00 ~-1 store success storage asset:context this.CheckBreak.9 byte 1 if block ~ ~ ~ #lib:no_collision_without_fluid run setblock ~ ~ ~ cyan_stained_glass + execute at @s positioned ~00 ~00 ~00 store success storage asset:context this.CheckBreak.1 byte 1 if block ~ ~ ~ #lib:no_collision/without_fluid run setblock ~ ~ ~ cyan_stained_glass + execute at @s positioned ~01 ~00 ~00 store success storage asset:context this.CheckBreak.2 byte 1 if block ~ ~ ~ #lib:no_collision/without_fluid run setblock ~ ~ ~ cyan_stained_glass + execute at @s positioned ~01 ~00 ~01 store success storage asset:context this.CheckBreak.3 byte 1 if block ~ ~ ~ #lib:no_collision/without_fluid run setblock ~ ~ ~ cyan_stained_glass + execute at @s positioned ~01 ~00 ~-1 store success storage asset:context this.CheckBreak.4 byte 1 if block ~ ~ ~ #lib:no_collision/without_fluid run setblock ~ ~ ~ cyan_stained_glass + execute at @s positioned ~-1 ~00 ~00 store success storage asset:context this.CheckBreak.5 byte 1 if block ~ ~ ~ #lib:no_collision/without_fluid run setblock ~ ~ ~ cyan_stained_glass + execute at @s positioned ~-1 ~00 ~01 store success storage asset:context this.CheckBreak.6 byte 1 if block ~ ~ ~ #lib:no_collision/without_fluid run setblock ~ ~ ~ cyan_stained_glass + execute at @s positioned ~-1 ~00 ~-1 store success storage asset:context this.CheckBreak.7 byte 1 if block ~ ~ ~ #lib:no_collision/without_fluid run setblock ~ ~ ~ cyan_stained_glass + execute at @s positioned ~00 ~00 ~01 store success storage asset:context this.CheckBreak.8 byte 1 if block ~ ~ ~ #lib:no_collision/without_fluid run setblock ~ ~ ~ cyan_stained_glass + execute at @s positioned ~00 ~00 ~-1 store success storage asset:context this.CheckBreak.9 byte 1 if block ~ ~ ~ #lib:no_collision/without_fluid run setblock ~ ~ ~ cyan_stained_glass # 同座標に同Objectがいればreturnして消滅 execute at @s positioned ~-0.5 ~-0.5 ~-0.5 if entity @e[type=item_display,tag=!2221.This,scores={ObjectID=2221},dx=0,limit=1] run return run kill @s diff --git a/Asset/data/asset/functions/object/2224.bee_bomb/tick/line.mcfunction b/Asset/data/asset/functions/object/2224.bee_bomb/tick/line.mcfunction index 6b8979a5817..9cd2ea0fc5d 100644 --- a/Asset/data/asset/functions/object/2224.bee_bomb/tick/line.mcfunction +++ b/Asset/data/asset/functions/object/2224.bee_bomb/tick/line.mcfunction @@ -7,4 +7,4 @@ # asset:object/2224.bee_bomb/tick/line particle minecraft:dust 1 0 0 0.3 ~ ~ ~ 0 0 0 0 1 -execute positioned ^ ^ ^0.5 if block ^ ^ ^ #lib:no_collision if entity @s[distance=..20] run function asset:object/2224.bee_bomb/tick/line +execute positioned ^ ^ ^0.5 if block ^ ^ ^ #lib:no_collision/ if entity @s[distance=..20] run function asset:object/2224.bee_bomb/tick/line diff --git a/Asset/data/asset/functions/object/2238.frestchika_holo_block/init/.mcfunction b/Asset/data/asset/functions/object/2238.frestchika_holo_block/init/.mcfunction index 539bf70e0bb..3751e0832bc 100644 --- a/Asset/data/asset/functions/object/2238.frestchika_holo_block/init/.mcfunction +++ b/Asset/data/asset/functions/object/2238.frestchika_holo_block/init/.mcfunction @@ -5,7 +5,7 @@ # @within asset:object/alias/2238/init # ブロック設置 - execute if block ~ ~ ~ #lib:no_collision run setblock ~ ~ ~ glass + execute if block ~ ~ ~ #lib:no_collision/ run setblock ~ ~ ~ glass # 移動 execute align xyz positioned ~0.5 ~ ~0.5 run tp @s ~ ~ ~ diff --git a/Asset/data/asset/functions/object/2238.frestchika_holo_block/tick/.mcfunction b/Asset/data/asset/functions/object/2238.frestchika_holo_block/tick/.mcfunction index 05abeec0cfa..fd32337d47b 100644 --- a/Asset/data/asset/functions/object/2238.frestchika_holo_block/tick/.mcfunction +++ b/Asset/data/asset/functions/object/2238.frestchika_holo_block/tick/.mcfunction @@ -12,7 +12,7 @@ execute if score @s General.Object.Tick matches 140.. align xyz positioned ~0.5 ~0.5 ~0.5 run particle minecraft:dust 1 0.5 0.5 0.75 ~ ~ ~ 0.15 0.15 0.15 0 1 # 自分の場所にあるブロックが消えたらキルされる - execute if block ~ ~ ~ #lib:no_collision run kill @s + execute if block ~ ~ ~ #lib:no_collision/ run kill @s # 消失 execute if score @s General.Object.Tick matches 200.. run function asset:object/2238.frestchika_holo_block/tick/break diff --git a/Asset/data/asset/functions/object/2240.frestchika_death/tick/.mcfunction b/Asset/data/asset/functions/object/2240.frestchika_death/tick/.mcfunction index 2231228e36e..9756bd0c5e9 100644 --- a/Asset/data/asset/functions/object/2240.frestchika_death/tick/.mcfunction +++ b/Asset/data/asset/functions/object/2240.frestchika_death/tick/.mcfunction @@ -12,15 +12,15 @@ execute at @s run tp @e[type=item_display,tag=2240.ModelRoot.Target,distance=..64,sort=nearest,limit=1] ~ ~ ~ ~ 0 # 足元に何もなければ - execute if block ~ ~-0.05 ~ #lib:no_collision run tp @s ~ ~-0.05 ~ - execute if block ~ ~-0.25 ~ #lib:no_collision run tp @s ~ ~-0.25 ~ + execute if block ~ ~-0.05 ~ #lib:no_collision/ run tp @s ~ ~-0.05 ~ + execute if block ~ ~-0.25 ~ #lib:no_collision/ run tp @s ~ ~-0.25 ~ # Tick加算 scoreboard players add @s General.Object.Tick 1 # 吹っ飛んでいく - execute if score @s General.Object.Tick matches 0..5 rotated ~ 0 if block ^ ^ ^-1 #lib:no_collision run tp @s ^ ^ ^-0.5 - execute if score @s General.Object.Tick matches 6..10 rotated ~ 0 if block ^ ^ ^-1 #lib:no_collision run tp @s ^ ^ ^-0.2 + execute if score @s General.Object.Tick matches 0..5 rotated ~ 0 if block ^ ^ ^-1 #lib:no_collision/ run tp @s ^ ^ ^-0.5 + execute if score @s General.Object.Tick matches 6..10 rotated ~ 0 if block ^ ^ ^-1 #lib:no_collision/ run tp @s ^ ^ ^-0.2 # パーティクル particle smoke ~ ~ ~ 0.2 0.5 0.2 0.01 1 diff --git a/Asset/data/asset/functions/object/2242.lawless_chaser_shot/tick/.mcfunction b/Asset/data/asset/functions/object/2242.lawless_chaser_shot/tick/.mcfunction index 38c5b564bbc..869160599e8 100644 --- a/Asset/data/asset/functions/object/2242.lawless_chaser_shot/tick/.mcfunction +++ b/Asset/data/asset/functions/object/2242.lawless_chaser_shot/tick/.mcfunction @@ -22,7 +22,7 @@ execute positioned ~-1 ~-1 ~-1 if entity @a[tag=!PlayerShouldInvulnerable,dx=1,dy=1,dz=1] run function asset:object/2242.lawless_chaser_shot/tick/explode # 地面と重なっても爆発する - execute unless block ~ ~ ~ #lib:no_collision run function asset:object/2242.lawless_chaser_shot/tick/explode + execute unless block ~ ~ ~ #lib:no_collision/ run function asset:object/2242.lawless_chaser_shot/tick/explode # 消滅処理(フェイルセーフ) kill @s[scores={General.Object.Tick=300..}] diff --git a/Asset/data/asset/functions/object/2246.lawless_trap_laser/common/recursive_laser.mcfunction b/Asset/data/asset/functions/object/2246.lawless_trap_laser/common/recursive_laser.mcfunction index 6764b24b03a..53e86a8984b 100644 --- a/Asset/data/asset/functions/object/2246.lawless_trap_laser/common/recursive_laser.mcfunction +++ b/Asset/data/asset/functions/object/2246.lawless_trap_laser/common/recursive_laser.mcfunction @@ -16,4 +16,4 @@ execute positioned ~-0.5 ~-0.5 ~-0.5 run tag @a[tag=!PlayerShouldInvulnerable,dx=0] add 2246.Hit # 壁がなかったら再帰 - execute if entity @s[distance=..32] positioned ^ ^ ^1 if block ~ ~ ~ #lib:no_collision run function asset:object/2246.lawless_trap_laser/common/recursive_laser + execute if entity @s[distance=..32] positioned ^ ^ ^1 if block ~ ~ ~ #lib:no_collision/ run function asset:object/2246.lawless_trap_laser/common/recursive_laser diff --git a/Asset/data/asset/functions/object/2251.wall_laser_clock/tick/vfx/fire/.mcfunction b/Asset/data/asset/functions/object/2251.wall_laser_clock/tick/vfx/fire/.mcfunction index ad7efbd5d2a..a2c6caa614a 100644 --- a/Asset/data/asset/functions/object/2251.wall_laser_clock/tick/vfx/fire/.mcfunction +++ b/Asset/data/asset/functions/object/2251.wall_laser_clock/tick/vfx/fire/.mcfunction @@ -12,4 +12,4 @@ scoreboard players operation $VFXPattern Temporary %= $2 Const execute if score $VFXPattern Temporary matches 0 run function asset:object/2251.wall_laser_clock/tick/vfx/fire/1 execute if score $VFXPattern Temporary matches 1 run function asset:object/2251.wall_laser_clock/tick/vfx/fire/2 -execute if block ~ ~ ~ #lib:no_collision if score $LaserDistance Temporary matches ..40 positioned ^ ^ ^0.8 run function asset:object/2251.wall_laser_clock/tick/vfx/fire/ +execute if block ~ ~ ~ #lib:no_collision/ if score $LaserDistance Temporary matches ..40 positioned ^ ^ ^0.8 run function asset:object/2251.wall_laser_clock/tick/vfx/fire/ diff --git a/Asset/data/asset/predicates/mob/0077.chorus_zombie/safe_place.json b/Asset/data/asset/predicates/mob/0077.chorus_zombie/safe_place.json index 012b6ac389a..90f8a96eb66 100644 --- a/Asset/data/asset/predicates/mob/0077.chorus_zombie/safe_place.json +++ b/Asset/data/asset/predicates/mob/0077.chorus_zombie/safe_place.json @@ -8,7 +8,7 @@ "offsetZ": 0, "predicate": { "block": { - "tag": "lib:no_collision" + "tag": "lib:no_collision/" } } }, @@ -19,7 +19,7 @@ "offsetZ": 0, "predicate": { "block": { - "tag": "lib:no_collision" + "tag": "lib:no_collision/" } } }, @@ -32,7 +32,7 @@ "offsetZ": 0, "predicate": { "block": { - "tag": "lib:no_collision" + "tag": "lib:no_collision/" } } } diff --git a/Asset/data/asset/tags/blocks/mob/0217.medousa_eye/passing_block.json b/Asset/data/asset/tags/blocks/mob/0217.medousa_eye/passing_block.json index 53d8fb498ae..59e0006e62f 100644 --- a/Asset/data/asset/tags/blocks/mob/0217.medousa_eye/passing_block.json +++ b/Asset/data/asset/tags/blocks/mob/0217.medousa_eye/passing_block.json @@ -1,7 +1,7 @@ { "replace": false, "values": [ - "#lib:no_collision", + "#lib:no_collision/", "#lib:glasses", "#lib:glass_panes", "minecraft:barrier" diff --git a/Asset/data/asset/tags/blocks/mob/0273.hell_blade/throughable.json b/Asset/data/asset/tags/blocks/mob/0273.hell_blade/throughable.json index c88d580983c..fd94f9f614e 100644 --- a/Asset/data/asset/tags/blocks/mob/0273.hell_blade/throughable.json +++ b/Asset/data/asset/tags/blocks/mob/0273.hell_blade/throughable.json @@ -1,6 +1,6 @@ { "values": [ - "#lib:no_collision", + "#lib:no_collision/", "minecraft:ladder" ] -} \ No newline at end of file +} diff --git a/Asset/data/asset/tags/blocks/mob/0365.frestchika/no_collision.json b/Asset/data/asset/tags/blocks/mob/0365.frestchika/no_collision.json index 8a495fb44f2..7281cc6dbf2 100644 --- a/Asset/data/asset/tags/blocks/mob/0365.frestchika/no_collision.json +++ b/Asset/data/asset/tags/blocks/mob/0365.frestchika/no_collision.json @@ -1,7 +1,7 @@ { "replace": false, "values": [ - "#lib:no_collision", + "#lib:no_collision/", "minecraft:glass" ] }