Merge remote-tracking branch 'origin/master' into dev/ella_mob_417

Asset/data/asset/functions/effect/0007.defense_base_debuff/modifier/add.mcfunction

@@ -7,7 +7,8 @@
 #   asset:effect/0007.defense_base_debuff/re-given/
 
 # 補正を付与する
-    data modify storage api: Argument.UUID set value [I;1,3,7,0]
+    data modify storage api: Argument.UUID set value [I;1,3,-1,0]
+    data modify storage api: Argument.UUID[2] set from storage asset:context id
     execute store result storage api: Argument.Amount double -0.05 run data get storage asset:context Stack 1
     data modify storage api: Argument.Operation set value "multiply"
     function api:modifier/defense/base/add

Asset/data/asset/functions/effect/0007.defense_base_debuff/modifier/remove.mcfunction

@@ -8,5 +8,6 @@
 #   asset:effect/0007.defense_base_debuff/remove/
 
 # 補正を削除する
-    data modify storage api: Argument.UUID set value [I;1,3,7,0]
+    data modify storage api: Argument.UUID set value [I;1,3,-1,0]
+    data modify storage api: Argument.UUID[2] set from storage asset:context id
     function api:modifier/defense/base/remove

Asset/data/asset/functions/effect/0007.defense_base_debuff/register.mcfunction

@@ -5,7 +5,7 @@
 # @within function asset:effect/0007.defense_base_debuff/_/register
 
 # ExtendsSafe (boolean) (default = false)
-    # data modify storage asset:effect ExtendsSafe set value true
+    data modify storage asset:effect ExtendsSafe set value true
 # ID (int)
     data modify storage asset:effect ID set value 7
 # 名前 (TextComponentString)

Asset/data/asset/functions/effect/0057.defense_base_debuff/_/register.mcfunction

@@ -0,0 +1,7 @@
+#> asset:effect/0057.defense_base_debuff/_/register
+#
+#
+#
+# @within tag/function asset:effect/register
+
+execute if data storage asset:context {id:57} run function asset:effect/0057.defense_base_debuff/register

Asset/data/asset/functions/effect/0057.defense_base_debuff/register.mcfunction

@@ -0,0 +1,13 @@
+#> asset:effect/0057.defense_base_debuff/register
+#
+# Effectのデータを指定
+#
+# @within function asset:effect/0057.defense_base_debuff/_/register
+
+# 継承 (int)
+    data modify storage asset:effect Extends append value 7
+    function asset:effect/extends
+# ID (int)
+    data modify storage asset:effect ID set value 57
+# 消すのに必要なレベル (int) (default = 1)
+    data modify storage asset:effect RequireClearLv set value 2

Asset/data/asset/functions/mob/0151.recombined/attack/.mcfunction

@@ -8,32 +8,25 @@
     execute unless data storage asset:context Attack{IsVanilla:true} run return fail
 
 
-# 与えるダメージ
-    data modify storage lib: Argument.Damage set value 25f
-# 属性
-    data modify storage lib: Argument.AttackType set value "Physical"
-    data modify storage lib: Argument.ElementType set value "None"
-# 補正functionを実行
-    function lib:damage/modifier
-# 対象
-    execute as @p[tag=Victim] run function lib:damage/
-# リセット
-    function lib:damage/reset
-
 # 演出
     playsound minecraft:entity.ghast.hurt hostile @a ~ ~ ~ 0.3 1.6
     playsound minecraft:entity.enderman.scream hostile @a ~ ~ ~ 0.4 2
 
+# ダメージ
+    data modify storage api: Argument.Damage set value 25f
+    data modify storage api: Argument.AttackType set value "Physical"
+    data modify storage api: Argument.ElementType set value "None"
+    function api:damage/modifier
+    execute as @p[tag=Victim] run function api:damage/
+    function api:damage/reset
+
+# デバフを付与
+    function api:global_vars/get_difficulty
+    data modify storage api: Argument.ID set value 57
+    execute store result storage api: Argument.Stack int 4 run data get storage api: Return.Difficulty 1
+    data modify storage api: Argument.Duration set value 60
+    execute as @p[tag=Victim] run function api:entity/mob/effect/give
+    function api:entity/mob/effect/reset
+
 # 腕を振る
     item replace entity @s weapon with iron_axe
-
-# プレイヤーの防具力を下げる(40)
-    attribute @p[tag=Victim] minecraft:generic.armor modifier add 1-0-2-0-9700000000 "1-2-151-0" -0.4 multiply
-
-# タグを付与
-    tag @p[tag=Victim] add 25.DefDown
-# スコアを付与
-    scoreboard players set @p[tag=Victim] 47.DefDownTime 60
-
-# Scheduleを発動
-    schedule function asset:mob/0151.recombined/attack/3.scheduleloop 1t

Asset/data/asset/tags/functions/effect/register.json

@@ -1,5 +1,6 @@
 {
     "values": [
+        "asset:effect/0057.defense_base_debuff/_/register",
         "asset:effect/0067.slowness/_/register",
         "asset:effect/0017.slowness/_/register",
         "asset:effect/0614.prominence_curse/_/register",
@@ -67,4 +68,4 @@
         "asset:effect/0007.defense_base_debuff/_/register",
         "asset:effect/0258.spirit_melody/_/register"
     ]
-}
+}

Asset/data/asset/tags/functions/effect/tick.json

@@ -48,4 +48,4 @@
         "asset:effect/0125.levitation/_/tick",
         "asset:effect/0258.spirit_melody/_/tick"
     ]
-}
+}

Asset/data/asset/tags/functions/mob/load.json

@@ -63,7 +63,6 @@
         "asset:mob/0092.red_rose/0.load",
         "asset:mob/0073.clutch_spider/0.load",
         "asset:mob/0155.immorality/0.load",
-        "asset:mob/0151.recombined/0.load",
         "asset:mob/0131.haruclaire/0.load",
         "asset:mob/0154.ruin/0.load",
         "asset:mob/0138.combat_turret/0.load",

Asset/data/asset/tags/functions/rejoin.json

@@ -56,7 +56,6 @@
         "asset:artifact/0265.holy_symbol_lv.5/trigger/rejoin_process",
         "asset:artifact/0269.holy_symbol_lv.10/trigger/rejoin_process",
         "asset:artifact/0373.ice_sorcery/trigger/rejoin_process",
-        "asset:mob/0151.recombined/rejoin_process",
         "asset:artifact/0610.call_fish/trigger/rejoin_process",
         "asset:mob/0131.haruclaire/rejoin_process"
     ]