diff --git a/Asset/data/asset/functions/effect/0007.defense_base_debuff/modifier/add.mcfunction b/Asset/data/asset/functions/effect/0007.defense_base_debuff/modifier/add.mcfunction index 0308a687aa..7a401e7aac 100644 --- a/Asset/data/asset/functions/effect/0007.defense_base_debuff/modifier/add.mcfunction +++ b/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 diff --git a/Asset/data/asset/functions/effect/0007.defense_base_debuff/modifier/remove.mcfunction b/Asset/data/asset/functions/effect/0007.defense_base_debuff/modifier/remove.mcfunction index 454a9977d5..851c1103bd 100644 --- a/Asset/data/asset/functions/effect/0007.defense_base_debuff/modifier/remove.mcfunction +++ b/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 diff --git a/Asset/data/asset/functions/effect/0007.defense_base_debuff/register.mcfunction b/Asset/data/asset/functions/effect/0007.defense_base_debuff/register.mcfunction index ae095d3374..7f5834787a 100644 --- a/Asset/data/asset/functions/effect/0007.defense_base_debuff/register.mcfunction +++ b/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) diff --git a/Asset/data/asset/functions/effect/0057.defense_base_debuff/_/register.mcfunction b/Asset/data/asset/functions/effect/0057.defense_base_debuff/_/register.mcfunction new file mode 100644 index 0000000000..a48ab89a92 --- /dev/null +++ b/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 \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0057.defense_base_debuff/register.mcfunction b/Asset/data/asset/functions/effect/0057.defense_base_debuff/register.mcfunction new file mode 100644 index 0000000000..8f7c195b73 --- /dev/null +++ b/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 diff --git a/Asset/data/asset/functions/mob/0151.recombined/0.load.mcfunction b/Asset/data/asset/functions/mob/0151.recombined/0.load.mcfunction deleted file mode 100644 index aaf895b5a8..0000000000 --- a/Asset/data/asset/functions/mob/0151.recombined/0.load.mcfunction +++ /dev/null @@ -1,9 +0,0 @@ -#> asset:mob/0151.recombined/0.load -# -# MOBに利用するスコアボード等の初期化処理 -# -# @within tag/function asset:mob/load - -#> 定義類はここに -# @within function asset:mob/0151.recombined/** - scoreboard objectives add 47.DefDownTime dummy diff --git a/Asset/data/asset/functions/mob/0151.recombined/_index.d.mcfunction b/Asset/data/asset/functions/mob/0151.recombined/_index.d.mcfunction deleted file mode 100644 index 1b9bfaa3d1..0000000000 --- a/Asset/data/asset/functions/mob/0151.recombined/_index.d.mcfunction +++ /dev/null @@ -1,8 +0,0 @@ -#> asset:mob/0151.recombined/_index.d -# @private - -#> tag -# @within function -# asset:mob/0151.recombined/** - #declare tag 25.DefDown - #alias uuid 1-2-151-0 1-0-2-0-9700000000 diff --git a/Asset/data/asset/functions/mob/0151.recombined/attack/.mcfunction b/Asset/data/asset/functions/mob/0151.recombined/attack/.mcfunction index bb99e2e43d..684273089d 100644 --- a/Asset/data/asset/functions/mob/0151.recombined/attack/.mcfunction +++ b/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 diff --git a/Asset/data/asset/functions/mob/0151.recombined/attack/3.scheduleloop.mcfunction b/Asset/data/asset/functions/mob/0151.recombined/attack/3.scheduleloop.mcfunction deleted file mode 100644 index 28100feaed..0000000000 --- a/Asset/data/asset/functions/mob/0151.recombined/attack/3.scheduleloop.mcfunction +++ /dev/null @@ -1,14 +0,0 @@ -#> asset:mob/0151.recombined/attack/3.scheduleloop -# -# -# -# @within function -# asset:mob/0151.recombined/attack/ -# asset:mob/0151.recombined/attack/3.scheduleloop -# asset:mob/0151.recombined/rejoin_process - -# 発動中 - execute as @a[tag=25.DefDown] at @s run function asset:mob/0151.recombined/attack/4.def_down - -# ループ - execute if entity @a[tag=25.DefDown] run schedule function asset:mob/0151.recombined/attack/3.scheduleloop 1t diff --git a/Asset/data/asset/functions/mob/0151.recombined/attack/4.def_down.mcfunction b/Asset/data/asset/functions/mob/0151.recombined/attack/4.def_down.mcfunction deleted file mode 100644 index 75433329cc..0000000000 --- a/Asset/data/asset/functions/mob/0151.recombined/attack/4.def_down.mcfunction +++ /dev/null @@ -1,19 +0,0 @@ -#> asset:mob/0151.recombined/attack/4.def_down -# -# -# -# @within function asset:mob/0151.recombined/attack/3.scheduleloop - -# 演出 - execute if predicate lib:random_pass_per/20 run particle minecraft:soul ~ ~1.3 ~ 0.2 0.2 0.2 0.06 2 - -# スコアをへらす - scoreboard players remove @s 47.DefDownTime 1 - -# 途中で死んだ時 - execute if entity @s[tag=Death] run tag @s remove 25.DefDown - -# 0になった時 - execute if score @s 47.DefDownTime matches 0 run playsound entity.generic.extinguish_fire player @a ~ ~ ~ 1 1 - execute if score @s 47.DefDownTime matches 0 run attribute @s minecraft:generic.armor modifier remove 1-0-2-0-9700000000 - execute if score @s 47.DefDownTime matches 0 run tag @s remove 25.DefDown diff --git a/Asset/data/asset/functions/mob/0151.recombined/rejoin_process.mcfunction b/Asset/data/asset/functions/mob/0151.recombined/rejoin_process.mcfunction deleted file mode 100644 index 64a6bee8e2..0000000000 --- a/Asset/data/asset/functions/mob/0151.recombined/rejoin_process.mcfunction +++ /dev/null @@ -1,7 +0,0 @@ -#> asset:mob/0151.recombined/rejoin_process -# -# 使い方は必ずwikiを見ること -# -# @within tag/function asset:rejoin -# ループ - execute if entity @a[tag=25.DefDown] run schedule function asset:mob/0151.recombined/attack/3.scheduleloop 1t diff --git a/Asset/data/asset/tags/functions/effect/register.json b/Asset/data/asset/tags/functions/effect/register.json index 7a35527d3f..44672a970b 100644 --- a/Asset/data/asset/tags/functions/effect/register.json +++ b/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" ] -} \ No newline at end of file +} diff --git a/Asset/data/asset/tags/functions/effect/tick.json b/Asset/data/asset/tags/functions/effect/tick.json index d329928ae9..0abdab9133 100644 --- a/Asset/data/asset/tags/functions/effect/tick.json +++ b/Asset/data/asset/tags/functions/effect/tick.json @@ -48,4 +48,4 @@ "asset:effect/0125.levitation/_/tick", "asset:effect/0258.spirit_melody/_/tick" ] -} \ No newline at end of file +} diff --git a/Asset/data/asset/tags/functions/mob/load.json b/Asset/data/asset/tags/functions/mob/load.json index 62c28743ec..7e30dd8967 100644 --- a/Asset/data/asset/tags/functions/mob/load.json +++ b/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", diff --git a/Asset/data/asset/tags/functions/rejoin.json b/Asset/data/asset/tags/functions/rejoin.json index 30167b608a..276c29884e 100644 --- a/Asset/data/asset/tags/functions/rejoin.json +++ b/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" ]