Merge remote-tracking branch 'origin/master' into dev/ella_mob_390_ra…

…bbit

.gitignore

@@ -1,4 +1,8 @@
 .DS_Store
 MACOSX
 *.zip
-cspell.json
+cspell.json
+.metals
+.scala-build
+.bsp
+.bloop

Asset/data/asset/functions/artifact/0769.shaking_splash/trigger/beam_recursive.mcfunction

@@ -17,7 +17,7 @@
     execute positioned ~-0.5 ~-0.5 ~-0.5 run tag @e[type=#lib:living,tag=Enemy,dx=0] add LandingTarget
 
 # ついでに火を消す おまけで範囲を広くしておく
-    execute if predicate world_manager:area/02.islands run fill ~1 ~1 ~1 ~-1 ~-1 ~-1 air replace fire
+    execute if predicate api:area/is_breakable run fill ~1 ~1 ~1 ~-1 ~-1 ~-1 air replace fire
 
 # 再帰
-    execute if entity @s[distance=..12] if block ^ ^ ^0.5 #lib:no_collision positioned ^ ^ ^0.5 run function asset:artifact/0769.shaking_splash/trigger/beam_recursive
+    execute if entity @s[distance=..12] if block ^ ^ ^0.5 #lib:no_collision positioned ^ ^ ^0.5 run function asset:artifact/0769.shaking_splash/trigger/beam_recursive

Asset/data/asset/functions/artifact/0769.shaking_splash/trigger/bullet/hit.mcfunction

@@ -23,7 +23,7 @@
     function api:damage/reset
 
 # ついでに火を消す
-    execute if predicate world_manager:area/02.islands run fill ~2.5 ~2.5 ~2.5 ~-2.5 ~-2.5 ~-2.5 air replace fire
+    execute if predicate api:area/is_breakable run fill ~2.5 ~2.5 ~2.5 ~-2.5 ~-2.5 ~-2.5 air replace fire
 
 # 消滅
     kill @s

Asset/data/asset/functions/artifact/0900.pure_water_bracelet/trigger/3.main.mcfunction

@@ -8,4 +8,4 @@
     function asset:artifact/common/use/hotbar
 
 # ここから先は神器側の効果の処理を書く
-    execute if predicate world_manager:area/02.islands unless block ~ ~ ~ lava unless block ~ ~1 ~ lava if predicate lib:random_pass_per/40 run summon potion ~ ~1 ~ {Silent:1b,Item:{id:"minecraft:stick",Count:1b,tag:{Potion:"minecraft:water",CustomModelData:1037}}}
+    execute if predicate api:area/is_breakable unless block ~ ~ ~ lava unless block ~ ~1 ~ lava if predicate lib:random_pass_per/40 run summon potion ~ ~1 ~ {Silent:1b,Item:{id:"minecraft:stick",Count:1b,tag:{Potion:"minecraft:water",CustomModelData:1037}}}

Asset/data/asset/functions/effect/0604.logging_of_soul/modifier/add.mcfunction

@@ -15,10 +15,12 @@
 
 # スタックを取得し、2を足し、storageへ代入
     execute store result score $Stack Temporary run data get storage asset:context Stack
-    execute store result storage asset:context this.ModfierValue float -0.1 run scoreboard players add $Stack Temporary 2
+    execute store result storage api: Argument.Amount float -0.1 run scoreboard players add $Stack Temporary 2
 
-# 代入する
-    function asset:effect/0604.logging_of_soul/modifier/add.m with storage asset:context this
+# modifierを付与
+    data modify storage api: Argument.UUID set value [I;1,3,604,0]
+    data modify storage api: Argument.Operation set value "multiply_base"
+    function api:modifier/max_health/add
 
 # リセット
     scoreboard players reset $Stack Temporary

Asset/data/asset/functions/effect/0604.logging_of_soul/modifier/remove.mcfunction

@@ -8,4 +8,5 @@
 #   asset:effect/0604.logging_of_soul/remove/
 
 # 最大体力
-    attribute @s generic.max_health modifier remove 00000001-0000-0003-0000-025c00000000
+    data modify storage api: Argument.UUID set value [I;1,3,604,0]
+    function api:modifier/max_health/remove

Asset/data/asset/functions/mob/0005.thief/register.mcfunction

@@ -40,7 +40,7 @@
 # 索敵範囲 (double) (オプション)
     data modify storage asset:mob FollowRange set value 25
 # ノックバック耐性 (double) (オプション)
-    data modify storage asset:mob KnockBackResist set value 0.0
+    # data modify storage asset:mob KnockBackResist set value
 # 属性倍率 // 1.0fで100% 最低でも25%は軽減されずに入る
     # 物理倍率 (float) (オプション)
         data modify storage asset:mob Resist.Physical set value 1.0

Asset/data/asset/functions/mob/0007.ectoplasm/attack/.mcfunction

@@ -3,6 +3,10 @@
 # Mobの攻撃時の処理
 #
 # @within function asset:mob/alias/7/attack
+
+# バニラの攻撃じゃなかったら return
+    execute unless data storage asset:context Attack{IsVanilla:true} run return fail
+
 #> private
 # @private
     #declare score_holder $EctoplasmMPCheck

Asset/data/asset/functions/mob/0007.ectoplasm/register.mcfunction

@@ -40,7 +40,7 @@
 # 索敵範囲 (double) (オプション)
     data modify storage asset:mob FollowRange set value 20
 # ノックバック耐性 (double) (オプション)
-    data modify storage asset:mob KnockBackResist set value 0
+    # data modify storage asset:mob KnockBackResist set value
 # 属性倍率 // 1.0fで100% 最低でも25%は軽減されずに入る
     # 物理倍率 (float) (オプション)
         data modify storage asset:mob Resist.Physical set value 1

Asset/data/asset/functions/mob/0015.guardian/register.mcfunction

@@ -40,7 +40,7 @@
 # 索敵範囲 (double) (オプション)
     data modify storage asset:mob FollowRange set value 32.0
 # ノックバック耐性 (double) (オプション)
-    data modify storage asset:mob KnockBackResist set value 0.0
+    # data modify storage asset:mob KnockBackResist set value
 # 属性倍率 // 1.0fで100% 最低でも25%は軽減されずに入る
     # 物理倍率 (float) (オプション)
         data modify storage asset:mob Resist.Physical set value 0.8

Asset/data/asset/functions/mob/0016.shirker/register.mcfunction

@@ -40,7 +40,7 @@
 # 索敵範囲 (double) (オプション)
     data modify storage asset:mob FollowRange set value 32.0
 # ノックバック耐性 (double) (オプション)
-    data modify storage asset:mob KnockBackResist set value 0.0
+    # data modify storage asset:mob KnockBackResist set value
 # 属性倍率 // 1.0fで100% 最低でも25%は軽減されずに入る
     # 物理倍率 (float) (オプション)
         data modify storage asset:mob Resist.Physical set value 1

Asset/data/asset/functions/mob/0017.fire_bird/attack/.mcfunction

@@ -4,6 +4,10 @@
 #
 # @within function asset:mob/alias/17/attack
 
+# バニラの攻撃じゃなかったら return
+    execute unless data storage asset:context Attack{IsVanilla:true} run return fail
+
+
 # 演出
     execute at @p[tag=Victim] run particle flame ~ ~1 ~ 0.8 0.8 0.8 0 20 normal @a
     execute at @p[tag=Victim] run playsound minecraft:block.fire.ambient hostile @a ~ ~ ~ 2 1 0

Asset/data/asset/functions/mob/0017.fire_bird/register.mcfunction

@@ -40,7 +40,7 @@
 # 索敵範囲 (double) (オプション)
     data modify storage asset:mob FollowRange set value 20
 # ノックバック耐性 (double) (オプション)
-    data modify storage asset:mob KnockBackResist set value 0.0
+    # data modify storage asset:mob KnockBackResist set value 
 # 属性倍率 // 1.0fで100% 最低でも25%は軽減されずに入る
     # 物理倍率 (float) (オプション)
         data modify storage asset:mob Resist.Physical set value 0.8

Asset/data/asset/functions/mob/0019.horus_priest/register.mcfunction

@@ -40,7 +40,7 @@
 # 索敵範囲 (double) (オプション)
     data modify storage asset:mob FollowRange set value 25.0
 # ノックバック耐性 (double) (オプション)
-    data modify storage asset:mob KnockBackResist set value 0.6
+    data modify storage asset:mob KnockBackResist set value 0.9
 # 属性倍率 // 1.0fで100% 最低でも25%は軽減されずに入る
     # 物理倍率 (float) (オプション)
         data modify storage asset:mob Resist.Physical set value 1

Asset/data/asset/functions/mob/0023.chainsaw_zombie/attack/.mcfunction

@@ -4,6 +4,10 @@
 #
 # @within function asset:mob/alias/23/attack
 
+# バニラの攻撃じゃなかったら return
+    execute unless data storage asset:context Attack{IsVanilla:true} run return fail
+
+
 # 演出
     execute at @p[tag=Victim] run particle block redstone_block ~ ~1 ~ 0.1 0.1 0.1 1.0 40
     playsound entity.wandering_trader.drink_potion hostile @a ~ ~ ~ 0.8 0.3

Asset/data/asset/functions/mob/0023.chainsaw_zombie/register.mcfunction

@@ -40,7 +40,7 @@
 # 索敵範囲 (double) (オプション)
     data modify storage asset:mob FollowRange set value 32
 # ノックバック耐性 (double) (オプション)
-    data modify storage asset:mob KnockBackResist set value 0
+    # data modify storage asset:mob KnockBackResist set value
 # 属性倍率 // 1.0fで100% 最低でも25%は軽減されずに入る
     # 物理倍率 (float) (オプション)
         data modify storage asset:mob Resist.Physical set value 0.8

Asset/data/asset/functions/mob/0026.vein/attack/.mcfunction

@@ -4,6 +4,10 @@
 #
 # @within function asset:mob/alias/26/attack
 
+# バニラの攻撃じゃなかったら return
+    execute unless data storage asset:context Attack{IsVanilla:true} run return fail
+
+
 # 演出
     playsound minecraft:block.note_block.basedrum hostile @a ~ ~ ~ 2 1.7 0
     execute at @p[tag=Victim] run particle dust 0.149 0.682 0.741 1 ~ ~ ~ 0.6 0.6 0.6 0 20 normal @a

Asset/data/asset/functions/mob/0026.vein/register.mcfunction

@@ -40,7 +40,7 @@
 # 索敵範囲 (double) (オプション)
     data modify storage asset:mob FollowRange set value 32.0
 # ノックバック耐性 (double) (オプション)
-    data modify storage asset:mob KnockBackResist set value 0.0
+    # data modify storage asset:mob KnockBackResist set value
 # 属性倍率 // 1.0fで100% 最低でも25%は軽減されずに入る
     # 物理倍率 (float) (オプション)
         data modify storage asset:mob Resist.Physical set value 1.0

Asset/data/asset/functions/mob/0027.skull_sniper/register.mcfunction

@@ -40,7 +40,7 @@
 # 索敵範囲 (double) (オプション)
     data modify storage asset:mob FollowRange set value 100
 # ノックバック耐性 (double) (オプション)
-    data modify storage asset:mob KnockBackResist set value 0
+    # data modify storage asset:mob KnockBackResist set value
 # 属性倍率 // 1.0fで100% 最低でも25%は軽減されずに入る
     # 物理倍率 (float) (オプション)
         data modify storage asset:mob Resist.Physical set value 1

Asset/data/asset/functions/mob/0029.skeleton_archer/register.mcfunction

@@ -40,7 +40,7 @@
 # 索敵範囲 (double) (オプション)
     data modify storage asset:mob FollowRange set value 32.0
 # ノックバック耐性 (double) (オプション)
-    data modify storage asset:mob KnockBackResist set value 0.0
+    # data modify storage asset:mob KnockBackResist set value
 # 属性倍率 // 1.0fで100% 最低でも25%は軽減されずに入る
     # 物理倍率 (float) (オプション)
         data modify storage asset:mob Resist.Physical set value 0.9

Asset/data/asset/functions/mob/0030.warped/attack/.mcfunction

@@ -4,6 +4,10 @@
 #
 # @within function asset:mob/alias/30/attack
 
+# バニラの攻撃じゃなかったら return
+    execute unless data storage asset:context Attack{IsVanilla:true} run return fail
+
+
 # 演出
     execute at @p[tag=Victim] run particle minecraft:dragon_breath ~ ~ ~ 0.5 1 0.5 0.05 50 normal @a
     execute at @p[tag=Victim] run playsound minecraft:block.end_portal_frame.fill hostile @a ~ ~ ~ 1 0.5 0

Asset/data/asset/functions/mob/0030.warped/register.mcfunction

@@ -40,7 +40,7 @@
 # 索敵範囲 (double) (オプション)
     data modify storage asset:mob FollowRange set value 32
 # ノックバック耐性 (double) (オプション)
-    data modify storage asset:mob KnockBackResist set value 0.2
+    data modify storage asset:mob KnockBackResist set value 0.8
 # 属性倍率 // 1.0fで100% 最低でも25%は軽減されずに入る
     # 物理倍率 (float) (オプション)
         data modify storage asset:mob Resist.Physical set value 0.93

Asset/data/asset/functions/mob/0037.fire_spreader/attack/.mcfunction

@@ -4,6 +4,10 @@
 #
 # @within function asset:mob/alias/37/attack
 
+# バニラの攻撃じゃなかったら return
+    execute unless data storage asset:context Attack{IsVanilla:true} run return fail
+
+
 # 演出
     execute at @p[gamemode=survival,tag=Victim,distance=..6] run particle flame ~ ~1.5 ~ 0.5 0.5 0.5 0.1 40 normal @a
     execute at @p[gamemode=survival,tag=Victim,distance=..6] run playsound entity.blaze.shoot hostile @a ~ ~ ~ 0.4 1.2 0

Asset/data/asset/functions/mob/0037.fire_spreader/register.mcfunction

@@ -40,7 +40,7 @@
 # 索敵範囲 (double) (オプション)
     data modify storage asset:mob FollowRange set value 15
 # ノックバック耐性 (double) (オプション)
-    data modify storage asset:mob KnockBackResist set value 0.2
+    data modify storage asset:mob KnockBackResist set value 0.8
 # 属性倍率 // 1.0fで100% 最低でも25%は軽減されずに入る
     # 物理倍率 (float) (オプション)
         data modify storage asset:mob Resist.Physical set value 0.75

Asset/data/asset/functions/mob/0047.the_heretic/attack/.mcfunction

@@ -4,6 +4,10 @@
 #
 # @within function asset:mob/alias/47/attack
 
+# バニラの攻撃じゃなかったら return
+    execute unless data storage asset:context Attack{IsVanilla:true} run return fail
+
+
 # 二回目以降の攻撃
     execute unless entity @s[tag=1B.First] run function asset:mob/0047.the_heretic/attack/2.2.attack2
 

Asset/data/asset/functions/mob/0047.the_heretic/register.mcfunction

@@ -40,7 +40,7 @@
 # 索敵範囲 (double) (オプション)
     data modify storage asset:mob FollowRange set value 32
 # ノックバック耐性 (double) (オプション)
-    data modify storage asset:mob KnockBackResist set value 0.5
+    data modify storage asset:mob KnockBackResist set value 0.875
 # 属性倍率 // 1.0fで100% 最低でも25%は軽減されずに入る
     # 物理倍率 (float) (オプション)
         data modify storage asset:mob Resist.Physical set value 0.3

Asset/data/asset/functions/mob/0049.ice_obstructor/attack/.mcfunction

@@ -4,6 +4,10 @@
 #
 # @within function asset:mob/alias/49/attack
 
+# バニラの攻撃じゃなかったら return
+    execute unless data storage asset:context Attack{IsVanilla:true} run return fail
+
+
 # 演出
     execute at @p[tag=Victim,distance=..32] run particle minecraft:falling_dust diamond_block ~ ~1.75 ~ 0.4 0.4 0.4 1 15
     execute at @p[tag=Victim,distance=..32] run playsound minecraft:block.glass.break hostile @a ~ ~ ~ 0.8 1.3 0

Asset/data/asset/functions/mob/0049.ice_obstructor/register.mcfunction

@@ -40,7 +40,7 @@
 # 索敵範囲 (double) (オプション)
     data modify storage asset:mob FollowRange set value 15
 # ノックバック耐性 (double) (オプション)
-    data modify storage asset:mob KnockBackResist set value 0.5
+    data modify storage asset:mob KnockBackResist set value 0.875
 # 属性倍率 // 1.0fで100% 最低でも25%は軽減されずに入る
     # 物理倍率 (float) (オプション)
         data modify storage asset:mob Resist.Physical set value 0.75

Asset/data/asset/functions/mob/0053.executioners/attack/.mcfunction

@@ -3,6 +3,10 @@
 # Mobの攻撃時の処理（雷弄者と似た感じ）
 #
 # @within function asset:mob/alias/53/attack
+
+# バニラの攻撃じゃなかったら return
+    execute unless data storage asset:context Attack{IsVanilla:true} run return fail
+
 #> tag
 # @within function asset:mob/0053.executioners/attack/
     #declare tag SpreadMarker

Asset/data/asset/functions/mob/0053.executioners/register.mcfunction

@@ -40,7 +40,7 @@
 # 索敵範囲 (double) (オプション)
     data modify storage asset:mob FollowRange set value 100
 # ノックバック耐性 (double) (オプション)
-    data modify storage asset:mob KnockBackResist set value 0.5
+    data modify storage asset:mob KnockBackResist set value 0.875
 # 属性倍率 // 1.0fで100% 最低でも25%は軽減されずに入る
     # 物理倍率 (float) (オプション)
         data modify storage asset:mob Resist.Physical set value 1

Asset/data/asset/functions/mob/0055.hetukedah/attack/.mcfunction

@@ -4,5 +4,9 @@
 #
 # @within function asset:mob/alias/55/attack
 
+# バニラの攻撃じゃなかったら return
+    execute unless data storage asset:context Attack{IsVanilla:true} run return fail
+
+
 # 演出
     playsound entity.ravager.attack hostile @a ~ ~ ~ 1 1

Asset/data/asset/functions/mob/0056.thunder_trifler/attack/.mcfunction

@@ -4,6 +4,10 @@
 #
 # @within function asset:mob/alias/56/attack
 
+# バニラの攻撃じゃなかったら return
+    execute unless data storage asset:context Attack{IsVanilla:true} run return fail
+
+
 # 演出
     particle minecraft:dust 1 1 0 2 ~ ~ ~ 0.8 0.8 0.8 0.1 20 normal @a
     particle minecraft:firework ~ ~1 ~ 0.5 0.5 0.5 0 10 normal @a

Asset/data/asset/functions/mob/0056.thunder_trifler/register.mcfunction

@@ -47,7 +47,7 @@
 # 索敵範囲 (double) (オプション)
     data modify storage asset:mob FollowRange set value 32
 # ノックバック耐性 (double) (オプション)
-    data modify storage asset:mob KnockBackResist set value 0.5
+    data modify storage asset:mob KnockBackResist set value 0.875
 # 属性倍率 // 1.0fで100% 最低でも25%は軽減されずに入る
     # 物理倍率 (float) (オプション)
         data modify storage asset:mob Resist.Physical set value 1

Asset/data/asset/functions/mob/0057.none_fighter/attack/.mcfunction

@@ -4,6 +4,10 @@
 #
 # @within function asset:mob/alias/57/attack
 
+# バニラの攻撃じゃなかったら return
+    execute unless data storage asset:context Attack{IsVanilla:true} run return fail
+
+
 # 演出
     execute at @p[tag=Victim] run particle minecraft:block white_concrete ~ ~1.2 ~ 1.0 0.5 1.0 0 40 normal @a
     execute at @p[tag=Victim] run playsound minecraft:block.stone.break hostile @a ~ ~ ~ 1 1.2 0

Asset/data/asset/functions/mob/0057.none_fighter/register.mcfunction

@@ -40,7 +40,7 @@
 # 索敵範囲 (double) (オプション)
     data modify storage asset:mob FollowRange set value 32
 # ノックバック耐性 (double) (オプション)
-    data modify storage asset:mob KnockBackResist set value 0.5
+    data modify storage asset:mob KnockBackResist set value 0.875
 # 属性倍率 // 1.0fで100% 最低でも25%は軽減されずに入る
     # 物理倍率 (float) (オプション)
         data modify storage asset:mob Resist.Physical set value 0.5

Asset/data/asset/functions/mob/0058.divide_haze/attack/.mcfunction

@@ -4,6 +4,10 @@
 #
 # @within function asset:mob/alias/58/attack
 
+# バニラの攻撃じゃなかったら return
+    execute unless data storage asset:context Attack{IsVanilla:true} run return fail
+
+
 # 演出
     execute at @p[tag=Victim,distance=..6] run particle dust 0 0.2 0.1 1 ~ ~1 ~ 0.5 0.5 0.5 1 20 normal @a
 

Asset/data/asset/functions/mob/0059.jack_o_lantern/attack/.mcfunction

@@ -4,6 +4,10 @@
 #
 # @within function asset:mob/alias/59/attack
 
+# バニラの攻撃じゃなかったら return
+    execute unless data storage asset:context Attack{IsVanilla:true} run return fail
+
+
 # 演出
     playsound entity.witch.celebrate hostile @a ~ ~ ~ 0.8 1.8 0
     execute at @p[tag=Victim,distance=..6] run particle dust 1 0.651 0 1 ~ ~1.2 ~ 0.4 0.4 0.4 0 15 normal @a

Asset/data/asset/functions/mob/0059.jack_o_lantern/death/.mcfunction

@@ -11,7 +11,7 @@
     playsound minecraft:entity.generic.explode hostile @a ~ ~ ~ 1.5 1.5
 
 # 死亡時カボチャ設置
-    execute if predicate world_manager:area/02.islands if block ~ ~ ~ #lib:air run summon falling_block ~ ~1.5 ~ {BlockState:{Name:"minecraft:carved_pumpkin"},Time:1,Motion:[0.0,0.7,0.0]}
+    execute if predicate api:area/is_breakable if block ~ ~ ~ #lib:air run summon falling_block ~ ~1.5 ~ {BlockState:{Name:"minecraft:carved_pumpkin"},Time:1,Motion:[0.0,0.7,0.0]}
 
 # ボスドロ
     data modify storage api: Argument.ID set value 950

Asset/data/asset/functions/mob/0060.self_destructor/attack/.mcfunction

@@ -4,6 +4,10 @@
 #
 # @within function asset:mob/alias/60/attack
 
+# バニラの攻撃じゃなかったら return
+    execute unless data storage asset:context Attack{IsVanilla:true} run return fail
+
+
 # ダメージ
     data modify storage lib: Argument.Damage set value 5.0
     data modify storage lib: Argument.AttackType set value "Physical"