diff --git a/Asset/data/asset/functions/artifact/0012.sketchy_herb/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0012.sketchy_herb/trigger/3.main.mcfunction index 756c176cd3..786a134986 100644 --- a/Asset/data/asset/functions/artifact/0012.sketchy_herb/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/0012.sketchy_herb/trigger/3.main.mcfunction @@ -13,8 +13,25 @@ effect give @s minecraft:strength 60 10 true effect give @s minecraft:resistance 60 1 true effect give @s minecraft:nausea 60 0 true - effect give @s minecraft:poison 15 3 true - effect give @s minecraft:instant_damage 1 1 true + +# 毒 + data modify storage api: Argument.ID set value 29 + data modify storage api: Argument.Stack set value 4 + data modify storage api: Argument.Duration set value 300 + function api:entity/mob/effect/give + function api:entity/mob/effect/reset + +# ダメージ + data modify storage api: Argument.Damage set value 6 + data modify storage api: Argument.BypassModifier set value true + function api:damage/modifier + data modify storage api: Argument.BypassArmorDefense set value true + data modify storage api: Argument.BypassArmorToughness set value true + data modify storage api: Argument.BypassEnchantments set value true + data modify storage api: Argument.BypassDifficulty set value true + data modify storage api: Argument.DeathMessage set value ['{"translate":"%1$s はハッパの中毒性に耐えられなかった","with":[{"selector":"@s"}]}'] + function api:damage/ + function api:damage/reset # 演出 particle minecraft:smoke ~ ~ ~ 1 1 1 0.1 500 force @s diff --git a/Asset/data/asset/functions/artifact/0190.amor_wand/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0190.amor_wand/give/2.give.mcfunction index 36769fd1f2..575a105c9c 100644 --- a/Asset/data/asset/functions/artifact/0190.amor_wand/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0190.amor_wand/give/2.give.mcfunction @@ -15,7 +15,7 @@ # 神器の名前 (TextComponentString) data modify storage asset:artifact Name set value '{"text":"アモールの杖","color":"aqua"}' # 神器の説明文 (TextComponentString[]) - data modify storage asset:artifact Lore set value ['{"text":"周囲のプレイヤーの体力を少しだけ回復する"}'] + data modify storage asset:artifact Lore set value ['{"text":"自身と周囲8mのプレイヤーの体力を7.0回復し"}','{"text":"その後10秒間かけて15.0回復する"}'] # 消費アイテム ({Item: TextComponent, Count: int, Extra?: TextComponent}) (オプション) # data modify storage asset:artifact ConsumeItem.Item set value # data modify storage asset:artifact ConsumeItem.Count set value @@ -41,14 +41,14 @@ # 攻撃に関する情報 -攻撃範囲 (literal) Wikiを参照 (オプション) # data modify storage asset:artifact AttackInfo.AttackRange set value # MP消費量 (int) - data modify storage asset:artifact MPCost set value 22 + data modify storage asset:artifact MPCost set value 40 # MP必要量 (int) (オプション) # data modify storage asset:artifact MPRequire set value # 神器のクールダウン (int) (オプション) # data modify storage asset:artifact LocalCooldown set value 160 # 種別クールダウン ({Type: string, Duration: int}) (オプション) data modify storage asset:artifact TypeCooldown.Type set value "heal" - data modify storage asset:artifact TypeCooldown.Duration set value 76 + data modify storage asset:artifact TypeCooldown.Duration set value 80 # グローバルクールダウン (int) (オプション) # data modify storage asset:artifact SpecialCooldown set value # クールダウンによる使用不可のメッセージを非表示にするか否か (boolean) (オプション) diff --git a/Asset/data/asset/functions/artifact/0190.amor_wand/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0190.amor_wand/trigger/3.main.mcfunction index 199b64b4bc..d3fff2fda0 100644 --- a/Asset/data/asset/functions/artifact/0190.amor_wand/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/0190.amor_wand/trigger/3.main.mcfunction @@ -15,9 +15,15 @@ execute positioned ~ ~4 ~ run function asset:artifact/0190.amor_wand/trigger/vfx/ # 回復 - data modify storage api: Argument.Heal set value 8.4 + data modify storage api: Argument.Heal set value 7.0f function api:heal/modifier execute as @a[distance=..8] run function api:heal/ - -# リセット function api:heal/reset + +# 再生 + data modify storage api: Argument.ID set value 301 + data modify storage api: Argument.Stack set value 1 + execute store result storage api: Argument.FieldOverride.UserID int 1 run scoreboard players get @s UserID + data modify storage api: Argument.FieldOverride.Heal set value 1.5 + execute as @a[distance=..8] run function api:entity/mob/effect/give + function api:entity/mob/effect/reset diff --git a/Asset/data/asset/functions/artifact/0191.horus_wand/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0191.horus_wand/give/2.give.mcfunction index e407dd3d50..9485b0abec 100644 --- a/Asset/data/asset/functions/artifact/0191.horus_wand/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0191.horus_wand/give/2.give.mcfunction @@ -15,7 +15,7 @@ # 神器の名前 (TextComponentString) data modify storage asset:artifact Name set value '{"text":"ホルスの杖","color":"gold"}' # 神器の説明文 (TextComponentString[]) - data modify storage asset:artifact Lore set value ['{"text":"周囲のプレイヤーの体力をそこそこ回復する"}'] + data modify storage asset:artifact Lore set value ['{"text":"自身と周囲8mのプレイヤーの体力を17.0回復し"}','{"text":"その後10秒間かけて24.0回復する"}'] # 消費アイテム ({Item: TextComponent, Count: int, Extra?: TextComponent}) (オプション) # data modify storage asset:artifact ConsumeItem.Item set value # data modify storage asset:artifact ConsumeItem.Count set value @@ -41,7 +41,7 @@ # 攻撃に関する情報 -攻撃範囲 (literal) Wikiを参照 (オプション) # data modify storage asset:artifact AttackInfo.AttackRange set value # MP消費量 (int) - data modify storage asset:artifact MPCost set value 72 + data modify storage asset:artifact MPCost set value 65 # MP必要量 (int) (オプション) # data modify storage asset:artifact MPRequire set value # 神器のクールダウン (int) (オプション) diff --git a/Asset/data/asset/functions/artifact/0191.horus_wand/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0191.horus_wand/trigger/3.main.mcfunction index ce2cb27c04..ffbb968c04 100644 --- a/Asset/data/asset/functions/artifact/0191.horus_wand/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/0191.horus_wand/trigger/3.main.mcfunction @@ -15,10 +15,15 @@ execute positioned ~ ~4 ~ run function asset:artifact/0191.horus_wand/trigger/vfx/ # 回復 - data modify storage api: Argument.Heal set value 15 + data modify storage api: Argument.Heal set value 17.0f function api:heal/modifier execute as @a[distance=..8] run function api:heal/ - effect give @a[distance=..8] regeneration 15 2 true - -# リセット function api:heal/reset + +# 再生 + data modify storage api: Argument.ID set value 301 + data modify storage api: Argument.Stack set value 2 + execute store result storage api: Argument.FieldOverride.UserID int 1 run scoreboard players get @s UserID + data modify storage api: Argument.FieldOverride.Heal set value 2.4 + execute as @a[distance=..8] run function api:entity/mob/effect/give + function api:entity/mob/effect/reset diff --git a/Asset/data/asset/functions/artifact/0192.falcios_wand/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0192.falcios_wand/give/2.give.mcfunction index 82da5d0af1..ac3b107079 100644 --- a/Asset/data/asset/functions/artifact/0192.falcios_wand/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0192.falcios_wand/give/2.give.mcfunction @@ -15,7 +15,7 @@ # 神器の名前 (TextComponentString) data modify storage asset:artifact Name set value '{"text":"ファルシオスの杖","color":"white","bold":true}' # 神器の説明文 (TextComponentString[]) - data modify storage asset:artifact Lore set value ['{"text":"周囲のプレイヤーの体力を大きく回復する"}'] + data modify storage asset:artifact Lore set value ['{"text":"自身と周囲8mのプレイヤーの体力を28.0回復し"}','{"text":"その後10秒間かけて30.0回復する"}'] # 消費アイテム ({Item: TextComponent, Count: int, Extra?: TextComponent}) (オプション) # data modify storage asset:artifact ConsumeItem.Item set value # data modify storage asset:artifact ConsumeItem.Count set value @@ -41,7 +41,7 @@ # 攻撃に関する情報 -攻撃範囲 (literal) Wikiを参照 (オプション) # data modify storage asset:artifact AttackInfo.AttackRange set value # MP消費量 (int) - data modify storage asset:artifact MPCost set value 82 + data modify storage asset:artifact MPCost set value 80 # MP必要量 (int) (オプション) # data modify storage asset:artifact MPRequire set value # 神器のクールダウン (int) (オプション) diff --git a/Asset/data/asset/functions/artifact/0192.falcios_wand/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0192.falcios_wand/trigger/3.main.mcfunction index 8d4f9aec68..4910257d42 100644 --- a/Asset/data/asset/functions/artifact/0192.falcios_wand/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/0192.falcios_wand/trigger/3.main.mcfunction @@ -15,10 +15,15 @@ execute positioned ~ ~4 ~ run function asset:artifact/0192.falcios_wand/trigger/vfx/ # 回復 - data modify storage api: Argument.Heal set value 26 + data modify storage api: Argument.Heal set value 28.0f function api:heal/modifier execute as @a[distance=..8] run function api:heal/ - effect give @a[distance=..8] regeneration 15 2 true - -# リセット function api:heal/reset + +# 再生 + data modify storage api: Argument.ID set value 301 + data modify storage api: Argument.Stack set value 3 + execute store result storage api: Argument.FieldOverride.UserID int 1 run scoreboard players get @s UserID + data modify storage api: Argument.FieldOverride.Heal set value 3.0 + execute as @a[distance=..8] run function api:entity/mob/effect/give + function api:entity/mob/effect/reset diff --git a/Asset/data/asset/functions/artifact/0252.void_transaction/register.mcfunction b/Asset/data/asset/functions/artifact/0252.void_transaction/register.mcfunction index da77f9ba2d..b00ace5260 100644 --- a/Asset/data/asset/functions/artifact/0252.void_transaction/register.mcfunction +++ b/Asset/data/asset/functions/artifact/0252.void_transaction/register.mcfunction @@ -4,4 +4,5 @@ # # @within tag/function asset:artifact/register -data modify storage asset:artifact RarityRegistry[3] append value [252] +# 一時的な封印指定 +# data modify storage asset:artifact RarityRegistry[3] append value [252] diff --git a/Asset/data/asset/functions/artifact/0437.only_the_crabs_know/trigger/taste/awful_taste.mcfunction b/Asset/data/asset/functions/artifact/0437.only_the_crabs_know/trigger/taste/awful_taste.mcfunction index 1981c7818c..421e64932e 100644 --- a/Asset/data/asset/functions/artifact/0437.only_the_crabs_know/trigger/taste/awful_taste.mcfunction +++ b/Asset/data/asset/functions/artifact/0437.only_the_crabs_know/trigger/taste/awful_taste.mcfunction @@ -1,17 +1,20 @@ #> asset:artifact/0437.only_the_crabs_know/trigger/taste/awful_taste # -# MP減少,毒 + 酷い味だ +# 毒 & MP減少 (酷い味だ) # # @within function asset:artifact/0437.only_the_crabs_know/trigger/3.main -# MP減少 - # 減少する量 = 50 - data modify storage api: Argument.Fluctuation set value -50 - function api:mp/fluctuation - -# 毒 - effect give @s poison 15 2 true - # 演出 tellraw @a[distance=..10] [{"selector":"@s","bold":true},{"text":"は酷い味だと酷評した"}] playsound entity.llama.ambient player @a ~ ~ ~ 1.0 1.0 + +# 毒 + data modify storage api: Argument.ID set value 29 + data modify storage api: Argument.Stack set value 3 + data modify storage api: Argument.Duration set value 300 + function api:entity/mob/effect/give + function api:entity/mob/effect/reset + +# MP減少 + data modify storage api: Argument.Fluctuation set value -50 + function api:mp/fluctuation diff --git a/Asset/data/asset/functions/artifact/0437.only_the_crabs_know/trigger/taste/excellent_soup.mcfunction b/Asset/data/asset/functions/artifact/0437.only_the_crabs_know/trigger/taste/excellent_soup.mcfunction index de2663d819..f10d62f8d1 100644 --- a/Asset/data/asset/functions/artifact/0437.only_the_crabs_know/trigger/taste/excellent_soup.mcfunction +++ b/Asset/data/asset/functions/artifact/0437.only_the_crabs_know/trigger/taste/excellent_soup.mcfunction @@ -1,22 +1,21 @@ #> asset:artifact/0437.only_the_crabs_know/trigger/taste/excellent_soup # -# HP,MP回復 + うまいっ! +# HPMP回復 (うまいっ!) # # @within function asset:artifact/0437.only_the_crabs_know/trigger/3.main -# HP回復 - # 回復する量 = 20 - data modify storage api: Argument.Heal set value 20f - function api:heal/modifier - function api:heal/ - # リセット - function api:heal/reset - -# MP回復 - # 回復する量 = 50 - data modify storage api: Argument.Fluctuation set value 50 - function api:mp/fluctuation - # 演出 tellraw @a[distance=..10] [{"selector":"@s","bold":true},{"text":"はうまいっ! と賞賛した"}] playsound entity.experience_orb.pickup player @a ~ ~ ~ 1.0 2.0 + +# HP回復 + data modify storage api: Argument.Heal set value 20f + data modify storage api: Argument.FixedHeal set value true + function api:heal/modifier + data modify storage api: Argument.FixedHeal set value false + function api:heal/ + function api:heal/reset + +# MP回復 + data modify storage api: Argument.Fluctuation set value 50 + function api:mp/fluctuation diff --git a/Asset/data/asset/functions/artifact/0437.only_the_crabs_know/trigger/taste/great_stock.mcfunction b/Asset/data/asset/functions/artifact/0437.only_the_crabs_know/trigger/taste/great_stock.mcfunction index 6ac852212c..deaa13ed10 100644 --- a/Asset/data/asset/functions/artifact/0437.only_the_crabs_know/trigger/taste/great_stock.mcfunction +++ b/Asset/data/asset/functions/artifact/0437.only_the_crabs_know/trigger/taste/great_stock.mcfunction @@ -1,18 +1,23 @@ #> asset:artifact/0437.only_the_crabs_know/trigger/taste/great_stock -# 回復,リジェネ + 出汁美味 +# +# 回復 & リジェネ (出汁美味) # # @within function asset:artifact/0437.only_the_crabs_know/trigger/3.main # HP回復 - # 回復する量 = 10 - data modify storage api: Argument.Heal set value 10f - function api:heal/modifier - function api:heal/ - # リセット - function api:heal/reset + data modify storage api: Argument.Heal set value 10f + data modify storage api: Argument.FixedHeal set value true + function api:heal/modifier + data modify storage api: Argument.FixedHeal set value false + function api:heal/ + function api:heal/reset # リジェネ - effect give @s regeneration 600 3 true + data modify storage api: Argument.ID set value 84 + data modify storage api: Argument.Stack set value 4 + data modify storage api: Argument.Duration set value 12000 + function api:entity/mob/effect/give + function api:entity/mob/effect/reset # 演出 tellraw @a[distance=..10] [{"selector":"@s","bold":true},{"text":"は出汁が良く出ていると絶賛した"}] diff --git a/Asset/data/asset/functions/artifact/0437.only_the_crabs_know/trigger/taste/heavenly_feeling.mcfunction b/Asset/data/asset/functions/artifact/0437.only_the_crabs_know/trigger/taste/heavenly_feeling.mcfunction index 2dcf3accf2..10f9989590 100644 --- a/Asset/data/asset/functions/artifact/0437.only_the_crabs_know/trigger/taste/heavenly_feeling.mcfunction +++ b/Asset/data/asset/functions/artifact/0437.only_the_crabs_know/trigger/taste/heavenly_feeling.mcfunction @@ -1,25 +1,22 @@ #> asset:artifact/0437.only_the_crabs_know/trigger/taste/heavenly_feeling # -# 初期ワープ,HPMP全快 + 天国にのぼるような +# 初期リスワープ & HPMP全快 (天国にのぼるような) # # @within function asset:artifact/0437.only_the_crabs_know/trigger/3.main +# 演出 + tellraw @a [{"selector":"@s","bold":true},{"text":"は天国に上るような錯覚がした"}] + playsound ui.toast.challenge_complete player @a 23 3 24 1.0 1.2 + # 初期地点ワープ execute in minecraft:overworld run tp @s 23 3 24 # HP、MP全快 - # HP回復 - function api:modifier/max_health/get - data modify storage api: Argument.Heal set from storage api: Return.MaxHealth - data modify storage api: Argument.FixedHeal set value true - function api:heal/modifier - function api:heal/ - function api:heal/reset + execute store result storage api: Argument.Heal double 0.01 run data get storage api: Return.MaxHealth 100 + data modify storage api: Argument.FixedHeal set value true + function api:heal/modifier + function api:heal/ + function api:heal/reset - # MP回復 - data modify storage api: Argument.Fluctuation set value 10000 - function api:mp/fluctuation - -# 演出 - tellraw @a [{"selector":"@s","bold":true},{"text":"は天国に上るような錯覚がした"}] - playsound ui.toast.challenge_complete player @a 23 3 24 1.0 1.2 + data modify storage api: Argument.Fluctuation set value 10000 + function api:mp/fluctuation diff --git a/Asset/data/asset/functions/artifact/0437.only_the_crabs_know/trigger/taste/sanity_decrease.mcfunction b/Asset/data/asset/functions/artifact/0437.only_the_crabs_know/trigger/taste/sanity_decrease.mcfunction index 823877f0d8..d7fa56e121 100644 --- a/Asset/data/asset/functions/artifact/0437.only_the_crabs_know/trigger/taste/sanity_decrease.mcfunction +++ b/Asset/data/asset/functions/artifact/0437.only_the_crabs_know/trigger/taste/sanity_decrease.mcfunction @@ -1,6 +1,6 @@ #> asset:artifact/0437.only_the_crabs_know/trigger/taste/sanity_decrease # -# HP減少MP回復 + 正気度減少 +# HP減少MP回復 (正気度減少) # # @within function asset:artifact/0437.only_the_crabs_know/trigger/3.main @@ -9,16 +9,14 @@ playsound entity.squid.death player @a ~ ~ ~ 1.0 1.5 # HP減少 - # 防御無視・補正なし・魔法・無属性の15のダメージを与える - data modify storage api: Argument.Damage set value 15f - data modify storage api: Argument.AttackType set value "Magic" - data modify storage api: Argument.FixedDamage set value true - data modify storage api: Argument.DeathMessage append value '[{"translate": "%1$sは正気を失った","with":[{"selector":"@s"}]}]' - function api:damage/modifier - function api:damage/ - function api:damage/reset + data modify storage api: Argument.Damage set value 15f + data modify storage api: Argument.AttackType set value "Magic" + data modify storage api: Argument.FixedDamage set value true + data modify storage api: Argument.DeathMessage append value '[{"translate": "%1$sは正気を失った","with":[{"selector":"@s"}]}]' + function api:damage/modifier + function api:damage/ + function api:damage/reset # MP回復 - # 回復する量 = 100 - data modify storage api: Argument.Fluctuation set value 100 - function api:mp/fluctuation + data modify storage api: Argument.Fluctuation set value 100 + function api:mp/fluctuation diff --git a/Asset/data/asset/functions/artifact/0563.heartland/trigger/0.load.mcfunction b/Asset/data/asset/functions/artifact/0563.heartland/trigger/0.load.mcfunction new file mode 100644 index 0000000000..dfc8ea8f2d --- /dev/null +++ b/Asset/data/asset/functions/artifact/0563.heartland/trigger/0.load.mcfunction @@ -0,0 +1,9 @@ +#> asset:artifact/0563.heartland/trigger/0.load +# +# 神器に利用するスコアボード等の初期化処理 +# +# @within tag/function asset:artifact/load + +#> 定義類はここに +# @within function asset:artifact/0563.heartland/trigger/** + scoreboard objectives add FN.LatestFullEffect dummy diff --git a/Asset/data/asset/functions/artifact/0563.heartland/trigger/fullset/tick/foreach.mcfunction b/Asset/data/asset/functions/artifact/0563.heartland/trigger/fullset/tick/foreach.mcfunction new file mode 100644 index 0000000000..2f1108e336 --- /dev/null +++ b/Asset/data/asset/functions/artifact/0563.heartland/trigger/fullset/tick/foreach.mcfunction @@ -0,0 +1,13 @@ +#> asset:artifact/0563.heartland/trigger/fullset/tick/foreach +# +# +# +# @within function asset:artifact/0563.heartland/trigger/fullset/tick/main + +data modify storage api: Argument.ID set value 266 +function api:entity/mob/effect/get/from_id +execute if data storage api: Return.Effect run return fail + +data modify storage api: Argument.ID set value 266 +function api:entity/mob/effect/give +function api:entity/mob/effect/reset diff --git a/Asset/data/asset/functions/artifact/0563.heartland/trigger/fullset/tick/main.mcfunction b/Asset/data/asset/functions/artifact/0563.heartland/trigger/fullset/tick/main.mcfunction index 11493227b2..6304746781 100644 --- a/Asset/data/asset/functions/artifact/0563.heartland/trigger/fullset/tick/main.mcfunction +++ b/Asset/data/asset/functions/artifact/0563.heartland/trigger/fullset/tick/main.mcfunction @@ -4,5 +4,13 @@ # # @within function asset:artifact/0563.heartland/trigger/fullset/tick/trigger -# 周囲5mのプレイヤーに既に自然回復エフェクトが付与されているかどうかを検知し、自然回復エフェクトを付与 - execute as @a[distance=..5] if predicate asset:artifact/0563.heartland/regene_check run effect give @a[distance=..5] regeneration 15 1 false +#> private +# @private + #declare score_holder $FN.Temp + +# 1秒に1回 + execute store result score $FN.Temp Temporary run data get storage global Time + scoreboard players operation $FN.Temp Temporary -= @s FN.LatestFullEffect + execute if score $FN.Temp Temporary matches 20.. as @a[distance=..5] run function asset:artifact/0563.heartland/trigger/fullset/tick/foreach + execute if score $FN.Temp Temporary matches 20.. store result score @s FN.LatestFullEffect run data get storage global Time + scoreboard players reset $FN.Temp Temporary diff --git a/Asset/data/asset/functions/artifact/0563.heartland/trigger/fullset/tick/trigger.mcfunction b/Asset/data/asset/functions/artifact/0563.heartland/trigger/fullset/tick/trigger.mcfunction index df1cbd9f63..0b704ac968 100644 --- a/Asset/data/asset/functions/artifact/0563.heartland/trigger/fullset/tick/trigger.mcfunction +++ b/Asset/data/asset/functions/artifact/0563.heartland/trigger/fullset/tick/trigger.mcfunction @@ -4,4 +4,4 @@ # # @within tag/function asset:artifact/tick - execute if entity @s[tag=FN.Fullset] run function asset:artifact/0563.heartland/trigger/fullset/tick/main +execute if entity @s[tag=FN.Fullset] run function asset:artifact/0563.heartland/trigger/fullset/tick/main diff --git a/Asset/data/asset/functions/artifact/1057.great_demon_head/trigger/tick/1.trigger.mcfunction b/Asset/data/asset/functions/artifact/1057.great_demon_head/trigger/tick/.mcfunction similarity index 71% rename from Asset/data/asset/functions/artifact/1057.great_demon_head/trigger/tick/1.trigger.mcfunction rename to Asset/data/asset/functions/artifact/1057.great_demon_head/trigger/tick/.mcfunction index 3b0490e4d5..5d9a7af2ad 100644 --- a/Asset/data/asset/functions/artifact/1057.great_demon_head/trigger/tick/1.trigger.mcfunction +++ b/Asset/data/asset/functions/artifact/1057.great_demon_head/trigger/tick/.mcfunction @@ -1,8 +1,8 @@ -#> asset:artifact/1057.great_demon_head/trigger/tick/1.trigger +#> asset:artifact/1057.great_demon_head/trigger/tick/ # # フルセット時の毎Tick処理 # # @within tag/function asset:artifact/tick # フルセットなら実行 - execute if data storage asset:context id{head:1057} if score @s TD.EquipCount matches 4 run function asset:artifact/1057.great_demon_head/trigger/tick/2.heal \ No newline at end of file + execute if data storage asset:context id{head:1057} if score @s TD.EquipCount matches 4 run function asset:artifact/1057.great_demon_head/trigger/tick/check diff --git a/Asset/data/asset/functions/artifact/1057.great_demon_head/trigger/tick/2.heal.mcfunction b/Asset/data/asset/functions/artifact/1057.great_demon_head/trigger/tick/check.mcfunction similarity index 56% rename from Asset/data/asset/functions/artifact/1057.great_demon_head/trigger/tick/2.heal.mcfunction rename to Asset/data/asset/functions/artifact/1057.great_demon_head/trigger/tick/check.mcfunction index 86b0510e00..df541eabc0 100644 --- a/Asset/data/asset/functions/artifact/1057.great_demon_head/trigger/tick/2.heal.mcfunction +++ b/Asset/data/asset/functions/artifact/1057.great_demon_head/trigger/tick/check.mcfunction @@ -1,19 +1,15 @@ -#> asset:artifact/1057.great_demon_head/trigger/tick/2.heal +#> asset:artifact/1057.great_demon_head/trigger/tick/check # -# 再生付与 # -# @within function asset:artifact/1057.great_demon_head/trigger/tick/1.trigger +# +# @within function asset:artifact/1057.great_demon_head/trigger/tick/ #> val # @private #declare score_holder $TD.Temp -# ゲーム時間取得 +# ゲーム内時間を参照 execute store result score $TD.Temp Temporary run time query gametime scoreboard players operation $TD.Temp Temporary %= $40 Const - -# 再生付与 - execute if score $TD.Temp Temporary matches 0 run effect give @s regeneration 3 0 true - -# リセット + execute if score $TD.Temp Temporary matches 0 run function asset:artifact/1057.great_demon_head/trigger/tick/heal scoreboard players reset $TD.Temp Temporary diff --git a/Asset/data/asset/functions/artifact/1057.great_demon_head/trigger/tick/heal.mcfunction b/Asset/data/asset/functions/artifact/1057.great_demon_head/trigger/tick/heal.mcfunction new file mode 100644 index 0000000000..197a8a5fc0 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1057.great_demon_head/trigger/tick/heal.mcfunction @@ -0,0 +1,14 @@ +#> asset:artifact/1057.great_demon_head/trigger/tick/heal +# +# +# +# @within function asset:artifact/1057.great_demon_head/trigger/tick/check + +function api:modifier/max_health/get +execute store result storage api: Argument.Heal double 0.015 run data get storage api: Return.MaxHealth +data modify storage api: Argument.FixedHeal set value true +function api:heal/modifier +data modify storage api: Argument.FixedHeal set value false +data modify storage api: Argument.ApplyTrigger set value false +function api:heal/ +function api:heal/reset diff --git a/Asset/data/asset/functions/effect/0029.poison/register.mcfunction b/Asset/data/asset/functions/effect/0029.poison/register.mcfunction index aa79930346..633a6a242b 100644 --- a/Asset/data/asset/functions/effect/0029.poison/register.mcfunction +++ b/Asset/data/asset/functions/effect/0029.poison/register.mcfunction @@ -17,13 +17,13 @@ # スタック (int) (default = API || 1) # data modify storage asset:effect Stack set value # 効果時間の操作方法 (default = API || "replace") - # data modify storage asset:effect DurationOperation set value + data modify storage asset:effect DurationOperation set value "forceReplace" # スタックの操作方法 (default = API || "replace") # data modify storage asset:effect StackOperation set value # 最大効果時間 (int) (default = 2147483647) # data modify storage asset:effect MaxDuration set value # 最大スタック (int) (default = 2147483647) - data modify storage asset:effect MaxStack set value 256 + data modify storage asset:effect MaxStack set value 99 # 悪い効果か否か (boolean) data modify storage asset:effect IsBadEffect set value true # 死亡時のエフェクトの処理 (default = "remove") @@ -36,4 +36,5 @@ # data modify storage asset:effect StackVisible set value # フィールド - # data modify storage asset:effect Field set value {} + data modify storage asset:effect Field.Tick set value 20 + data modify storage asset:effect Field.DamagePer set value 0.01 diff --git a/Asset/data/asset/functions/effect/0029.poison/tick/.mcfunction b/Asset/data/asset/functions/effect/0029.poison/tick/.mcfunction index a612d3e068..aa0ec14763 100644 --- a/Asset/data/asset/functions/effect/0029.poison/tick/.mcfunction +++ b/Asset/data/asset/functions/effect/0029.poison/tick/.mcfunction @@ -4,7 +4,10 @@ # # @within function asset:effect/0029.poison/_/tick -# (Stack - 1)を求めてマクロで付与する - execute store result storage asset:temp 29.Stack int 0.9999999999 run data get storage asset:context Stack - function asset:effect/0029.poison/tick/m with storage asset:temp 29 - data remove storage asset:temp 29 +# 緑ハート + effect give @s poison 1 0 true + +# 1秒ごとにダメージ + execute store result storage asset:context this.Tick int 0.9999999999 run data get storage asset:context this.Tick 1 + execute if data storage asset:context this{Tick:0} run function asset:effect/0029.poison/tick/deal_damage + execute if data storage asset:context this{Tick:0} run data modify storage asset:context this.Tick set value 20 diff --git a/Asset/data/asset/functions/effect/0029.poison/tick/deal_damage.mcfunction b/Asset/data/asset/functions/effect/0029.poison/tick/deal_damage.mcfunction new file mode 100644 index 0000000000..297ed84831 --- /dev/null +++ b/Asset/data/asset/functions/effect/0029.poison/tick/deal_damage.mcfunction @@ -0,0 +1,31 @@ +#> asset:effect/0029.poison/tick/deal_damage +# @within function asset:effect/0029.poison/tick/ + +#> private +# @private + #declare score_holder $Damage + #declare score_holder $Per + #declare score_holder $Stack + +# 現在体力の (Stack)% + function api:data_get/health + execute store result score $Damage Temporary run data get storage api: Health + execute store result score $Per Temporary run data get storage asset:context this.DamagePer 10000 + execute store result score $Stack Temporary run data get storage asset:context Stack + scoreboard players operation $Damage Temporary *= $Per Temporary + scoreboard players operation $Damage Temporary *= $Stack Temporary + execute store result storage api: Argument.Damage double 0.0001 run scoreboard players get $Damage Temporary + data modify storage api: Argument.BypassModifier set value true + function api:damage/modifier + data modify storage api: Argument.BypassArmorDefense set value true + data modify storage api: Argument.BypassArmorToughness set value true + data modify storage api: Argument.BypassEnchantments set value true + data modify storage api: Argument.BypassDifficulty set value true + data modify storage api: Argument.ApplyTrigger set value false + function api:damage/ + function api:damage/reset + +# リセット + scoreboard players reset $Damage Temporary + scoreboard players reset $Per Temporary + scoreboard players reset $Stack Temporary diff --git a/Asset/data/asset/functions/effect/0029.poison/tick/m.mcfunction b/Asset/data/asset/functions/effect/0029.poison/tick/m.mcfunction deleted file mode 100644 index a261d825f4..0000000000 --- a/Asset/data/asset/functions/effect/0029.poison/tick/m.mcfunction +++ /dev/null @@ -1,7 +0,0 @@ -#> asset:effect/0029.poison/tick/m -# -# マクロで付与する -# -# @within function asset:effect/0029.poison/tick/ - -$effect give @s poison 5 $(Stack) true diff --git a/Asset/data/asset/functions/effect/0030.wither/register.mcfunction b/Asset/data/asset/functions/effect/0030.wither/register.mcfunction index 3a6c5264af..eb88840409 100644 --- a/Asset/data/asset/functions/effect/0030.wither/register.mcfunction +++ b/Asset/data/asset/functions/effect/0030.wither/register.mcfunction @@ -17,13 +17,13 @@ # スタック (int) (default = API || 1) # data modify storage asset:effect Stack set value # 効果時間の操作方法 (default = API || "replace") - # data modify storage asset:effect DurationOperation set value + data modify storage asset:effect DurationOperation set value "forceReplace" # スタックの操作方法 (default = API || "replace") # data modify storage asset:effect StackOperation set value # 最大効果時間 (int) (default = 2147483647) # data modify storage asset:effect MaxDuration set value # 最大スタック (int) (default = 2147483647) - data modify storage asset:effect MaxStack set value 256 + data modify storage asset:effect MaxStack set value 100 # 悪い効果か否か (boolean) data modify storage asset:effect IsBadEffect set value true # 死亡時のエフェクトの処理 (default = "remove") @@ -36,4 +36,5 @@ # data modify storage asset:effect StackVisible set value # フィールド - # data modify storage asset:effect Field set value {} + data modify storage asset:effect Field.Tick set value 20 + data modify storage asset:effect Field.DamagePer set value 0.01 diff --git a/Asset/data/asset/functions/effect/0030.wither/tick/.mcfunction b/Asset/data/asset/functions/effect/0030.wither/tick/.mcfunction index 2d64c07a39..bfd0007061 100644 --- a/Asset/data/asset/functions/effect/0030.wither/tick/.mcfunction +++ b/Asset/data/asset/functions/effect/0030.wither/tick/.mcfunction @@ -4,7 +4,10 @@ # # @within function asset:effect/0030.wither/_/tick -# (Stack - 1)を求めてマクロで付与する - execute store result storage asset:temp 30.Stack int 0.9999999999 run data get storage asset:context Stack - function asset:effect/0030.wither/tick/m with storage asset:temp 30 - data remove storage asset:temp 30 +# 黒ハート + effect give @s wither 1 0 true + +# 1秒ごとにダメージ + execute store result storage asset:context this.Tick int 0.9999999999 run data get storage asset:context this.Tick 1 + execute if data storage asset:context this{Tick:0} run function asset:effect/0030.wither/tick/deal_damage + execute if data storage asset:context this{Tick:0} run data modify storage asset:context this.Tick set value 20 diff --git a/Asset/data/asset/functions/effect/0030.wither/tick/deal_damage.mcfunction b/Asset/data/asset/functions/effect/0030.wither/tick/deal_damage.mcfunction new file mode 100644 index 0000000000..58224392e8 --- /dev/null +++ b/Asset/data/asset/functions/effect/0030.wither/tick/deal_damage.mcfunction @@ -0,0 +1,32 @@ +#> asset:effect/0030.wither/tick/deal_damage +# @within function asset:effect/0030.wither/tick/ + +#> private +# @private + #declare score_holder $Damage + #declare score_holder $Per + #declare score_holder $Stack + +# 最大体力の (Stack)% + function api:modifier/max_health/get + execute store result score $Damage Temporary run data get storage api: Return.MaxHealth + execute store result score $Per Temporary run data get storage asset:context this.DamagePer 10000 + execute store result score $Stack Temporary run data get storage asset:context Stack + scoreboard players operation $Damage Temporary *= $Per Temporary + scoreboard players operation $Damage Temporary *= $Stack Temporary + execute store result storage api: Argument.Damage double 0.0001 run scoreboard players get $Damage Temporary + data modify storage api: Argument.BypassModifier set value true + function api:damage/modifier + data modify storage api: Argument.BypassArmorDefense set value true + data modify storage api: Argument.BypassArmorToughness set value true + data modify storage api: Argument.BypassEnchantments set value true + data modify storage api: Argument.BypassDifficulty set value true + data modify storage api: Argument.ApplyTrigger set value false + data modify storage api: Argument.DeathMessage set value ['{"translate":"%s は衰弱死した","with":[{"selector":"@s"}]}','{"translate":"%s は干からびた","with":[{"selector":"@s"}]}','{"translate":"%s の生命は枯れ果てた","with":[{"selector":"@s"}]}'] + function api:damage/ + function api:damage/reset + +# リセット + scoreboard players reset $Damage Temporary + scoreboard players reset $Per Temporary + scoreboard players reset $Stack Temporary diff --git a/Asset/data/asset/functions/effect/0030.wither/tick/m.mcfunction b/Asset/data/asset/functions/effect/0030.wither/tick/m.mcfunction deleted file mode 100644 index 4e19924891..0000000000 --- a/Asset/data/asset/functions/effect/0030.wither/tick/m.mcfunction +++ /dev/null @@ -1,9 +0,0 @@ -#> asset:effect/0030.wither/tick/m -# -# マクロで付与する -# -# @input args: -# Stack : int -# @within function asset:effect/0030.wither/tick/ - -$effect give @s wither 6 $(Stack) true diff --git a/Asset/data/asset/functions/effect/0034.regeneration/_/end.mcfunction b/Asset/data/asset/functions/effect/0034.regeneration/_/end.mcfunction new file mode 100644 index 0000000000..e96b219f65 --- /dev/null +++ b/Asset/data/asset/functions/effect/0034.regeneration/_/end.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0034.regeneration/_/end +# +# Effectの効果の終了時に実行されるfunction +# +# @within tag/function asset:effect/end + +execute if data storage asset:context {id:34} run function asset:effect/0034.regeneration/end/ \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0034.regeneration/_/register.mcfunction b/Asset/data/asset/functions/effect/0034.regeneration/_/register.mcfunction new file mode 100644 index 0000000000..5cf207fd3c --- /dev/null +++ b/Asset/data/asset/functions/effect/0034.regeneration/_/register.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0034.regeneration/_/register +# +# +# +# @within tag/function asset:effect/register + +execute if data storage asset:context {id:34} run function asset:effect/0034.regeneration/register \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0034.regeneration/_/remove.mcfunction b/Asset/data/asset/functions/effect/0034.regeneration/_/remove.mcfunction new file mode 100644 index 0000000000..d4e371e7c3 --- /dev/null +++ b/Asset/data/asset/functions/effect/0034.regeneration/_/remove.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0034.regeneration/_/remove +# +# Effectが神器や牛乳によって削除された時に実行されるfunction +# +# @within tag/function asset:effect/remove + +execute if data storage asset:context {id:34} run function asset:effect/0034.regeneration/remove/ \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0034.regeneration/_/tick.mcfunction b/Asset/data/asset/functions/effect/0034.regeneration/_/tick.mcfunction new file mode 100644 index 0000000000..6b2c722aa6 --- /dev/null +++ b/Asset/data/asset/functions/effect/0034.regeneration/_/tick.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0034.regeneration/_/tick +# +# Effectが発動している間毎tick実行されるfunction +# +# @within tag/function asset:effect/tick + +execute if data storage asset:context {id:34} run function asset:effect/0034.regeneration/tick/ \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0034.regeneration/end/.mcfunction b/Asset/data/asset/functions/effect/0034.regeneration/end/.mcfunction new file mode 100644 index 0000000000..200e6ad185 --- /dev/null +++ b/Asset/data/asset/functions/effect/0034.regeneration/end/.mcfunction @@ -0,0 +1,5 @@ +#> asset:effect/0034.regeneration/end/ +# +# Effectの効果が切れた時の処理 +# +# @within function asset:effect/0034.regeneration/_/end \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0034.regeneration/register.mcfunction b/Asset/data/asset/functions/effect/0034.regeneration/register.mcfunction new file mode 100644 index 0000000000..87587c8da0 --- /dev/null +++ b/Asset/data/asset/functions/effect/0034.regeneration/register.mcfunction @@ -0,0 +1,40 @@ +#> asset:effect/0034.regeneration/register +# +# Effectのデータを指定 +# +# @within function asset:effect/0034.regeneration/_/register + +# ExtendsSafe (boolean) (default = false) + data modify storage asset:effect ExtendsSafe set value true +# ID (int) + data modify storage asset:effect ID set value 34 +# 名前 (TextComponentString) + data modify storage asset:effect Name set value "再生" +# 説明文 (TextComponentString[]) + data modify storage asset:effect Description set value ['{"text":"継続的に体力を回復する"}'] +# 効果時間 (int) (default = API || error) + # data modify storage asset:effect Duration set value +# スタック (int) (default = API || 1) + # data modify storage asset:effect Stack set value +# 効果時間の操作方法 (default = API || "replace") + data modify storage asset:effect DurationOperation set value "forceReplace" +# スタックの操作方法 (default = API || "replace") + # data modify storage asset:effect StackOperation set value +# 最大効果時間 (int) (default = 2147483647) + # data modify storage asset:effect MaxDuration set value +# 最大スタック (int) (default = 2147483647) + data modify storage asset:effect MaxStack set value 100 +# 悪い効果か否か (boolean) + data modify storage asset:effect IsBadEffect set value false +# 死亡時のエフェクトの処理 (default = "remove") + # data modify storage asset:effect ProcessOnDied set value +# 消すのに必要なレベル (int) (default = 1) + data modify storage asset:effect RequireClearLv set value 1 +# エフェクトをUIに表示するか (boolean) (default = true) + # data modify storage asset:effect Visible set value +# エフェクトのスタックををUIに表示するか (boolean) (default = true) + # data modify storage asset:effect StackVisible set value + +# フィールド + data modify storage asset:effect Field.Tick set value 20 + data modify storage asset:effect Field.HealPerStack set value 1d diff --git a/Asset/data/asset/functions/effect/0034.regeneration/remove/.mcfunction b/Asset/data/asset/functions/effect/0034.regeneration/remove/.mcfunction new file mode 100644 index 0000000000..c1709a8113 --- /dev/null +++ b/Asset/data/asset/functions/effect/0034.regeneration/remove/.mcfunction @@ -0,0 +1,5 @@ +#> asset:effect/0034.regeneration/remove/ +# +# Effectが削除された時の処理 +# +# @within function asset:effect/0034.regeneration/_/remove \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0034.regeneration/tick/.mcfunction b/Asset/data/asset/functions/effect/0034.regeneration/tick/.mcfunction new file mode 100644 index 0000000000..6d5504052a --- /dev/null +++ b/Asset/data/asset/functions/effect/0034.regeneration/tick/.mcfunction @@ -0,0 +1,13 @@ +#> asset:effect/0034.regeneration/tick/ +# +# Effectのtick処理 +# +# @within function asset:effect/0034.regeneration/_/tick + +# 回復してそうな感じ + effect give @s regeneration 1 0 true + +# 1秒ごとに回復 + execute store result storage asset:context this.Tick int 0.9999999999 run data get storage asset:context this.Tick 1 + execute if data storage asset:context this{Tick:0} run function asset:effect/0034.regeneration/tick/heal + execute if data storage asset:context this{Tick:0} run data modify storage asset:context this.Tick set value 20 diff --git a/Asset/data/asset/functions/effect/0034.regeneration/tick/heal.mcfunction b/Asset/data/asset/functions/effect/0034.regeneration/tick/heal.mcfunction new file mode 100644 index 0000000000..9b90c6a659 --- /dev/null +++ b/Asset/data/asset/functions/effect/0034.regeneration/tick/heal.mcfunction @@ -0,0 +1,26 @@ +#> asset:effect/0034.regeneration/tick/heal +# +# +# +# @within function asset:effect/0034.regeneration/tick/ + +#> private +# @private + #declare score_holder $Heal + #declare score_holder $Stack + +# Stack * HealPerStack 分回復 + execute store result score $Heal Temporary run data get storage asset:context this.HealPerStack 100 + execute store result score $Stack Temporary run data get storage asset:context Stack + scoreboard players operation $Heal Temporary *= $Stack Temporary + execute store result storage api: Argument.Heal double 0.01 run scoreboard players get $Heal Temporary + data modify storage api: Argument.FixedHeal set value true + function api:heal/modifier + data modify storage api: Argument.FixedHeal set value false + data modify storage api: Argument.ApplyTrigger set value false + function api:heal/ + function api:heal/reset + +# リセット + scoreboard players reset $Heal Temporary + scoreboard players reset $Stack Temporary diff --git a/Asset/data/asset/functions/effect/0084.regeneration/_/register.mcfunction b/Asset/data/asset/functions/effect/0084.regeneration/_/register.mcfunction new file mode 100644 index 0000000000..867940284e --- /dev/null +++ b/Asset/data/asset/functions/effect/0084.regeneration/_/register.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0084.regeneration/_/register +# +# +# +# @within tag/function asset:effect/register + +execute if data storage asset:context {id:84} run function asset:effect/0084.regeneration/register \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0084.regeneration/register.mcfunction b/Asset/data/asset/functions/effect/0084.regeneration/register.mcfunction new file mode 100644 index 0000000000..31d17f6196 --- /dev/null +++ b/Asset/data/asset/functions/effect/0084.regeneration/register.mcfunction @@ -0,0 +1,13 @@ +#> asset:effect/0084.regeneration/register +# +# Effectのデータを指定 +# +# @within function asset:effect/0084.regeneration/_/register + +# 継承 (int) + data modify storage asset:effect Extends append value 34 + function asset:effect/extends +# ID (int) + data modify storage asset:effect ID set value 84 +# 消すのに必要なレベル (int) (default = 1) + data modify storage asset:effect RequireClearLv set value 2 diff --git a/Asset/data/asset/functions/effect/0134.regeneration/_/register.mcfunction b/Asset/data/asset/functions/effect/0134.regeneration/_/register.mcfunction new file mode 100644 index 0000000000..e3882c8fe2 --- /dev/null +++ b/Asset/data/asset/functions/effect/0134.regeneration/_/register.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0134.regeneration/_/register +# +# +# +# @within tag/function asset:effect/register + +execute if data storage asset:context {id:134} run function asset:effect/0134.regeneration/register \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0134.regeneration/register.mcfunction b/Asset/data/asset/functions/effect/0134.regeneration/register.mcfunction new file mode 100644 index 0000000000..d57c6f14c7 --- /dev/null +++ b/Asset/data/asset/functions/effect/0134.regeneration/register.mcfunction @@ -0,0 +1,13 @@ +#> asset:effect/0134.regeneration/register +# +# Effectのデータを指定 +# +# @within function asset:effect/0134.regeneration/_/register + +# 継承 (int) + data modify storage asset:effect Extends append value 34 + function asset:effect/extends +# ID (int) + data modify storage asset:effect ID set value 134 +# 消すのに必要なレベル (int) (default = 1) + data modify storage asset:effect RequireClearLv set value 3 diff --git a/Asset/data/asset/functions/effect/0205.convallatoxin/tick/deal_damage.mcfunction b/Asset/data/asset/functions/effect/0205.convallatoxin/tick/deal_damage.mcfunction index 7cd18014db..0f556b59e1 100644 --- a/Asset/data/asset/functions/effect/0205.convallatoxin/tick/deal_damage.mcfunction +++ b/Asset/data/asset/functions/effect/0205.convallatoxin/tick/deal_damage.mcfunction @@ -13,6 +13,7 @@ data modify storage api: Argument.Damage set from storage asset:context this.Damage data modify storage api: Argument.AttackType set value "Physical" execute as @a if score @s UserID = $AppliedFrom Temporary run function api:damage/modifier + data modify storage api: Argument.ApplyTrigger set value false function api:damage/ function api:damage/reset # リセット diff --git a/Asset/data/asset/functions/effect/0266.grace_of_the_earth/_/register.mcfunction b/Asset/data/asset/functions/effect/0266.grace_of_the_earth/_/register.mcfunction new file mode 100644 index 0000000000..570495d781 --- /dev/null +++ b/Asset/data/asset/functions/effect/0266.grace_of_the_earth/_/register.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0266.grace_of_the_earth/_/register +# +# +# +# @within tag/function asset:effect/register + +execute if data storage asset:context {id:266} run function asset:effect/0266.grace_of_the_earth/register \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0266.grace_of_the_earth/register.mcfunction b/Asset/data/asset/functions/effect/0266.grace_of_the_earth/register.mcfunction new file mode 100644 index 0000000000..06fec454d9 --- /dev/null +++ b/Asset/data/asset/functions/effect/0266.grace_of_the_earth/register.mcfunction @@ -0,0 +1,20 @@ +#> asset:effect/0266.grace_of_the_earth/register +# +# Effectのデータを指定 +# +# @within function asset:effect/0266.grace_of_the_earth/_/register + +# 継承 (int) + data modify storage asset:effect Extends append value 84 + function asset:effect/extends +# ID (int) + data modify storage asset:effect ID set value 266 +# 名前 (TextComponentString) + data modify storage asset:effect Name set value '{"text":"大地の恵み","color":"green"}' +# 効果時間 (int) (default = API || error) + data modify storage asset:effect Duration set value 300 +# スタック (int) (default = API || 1) + data modify storage asset:effect Stack set value 1 + +# フィールド + data modify storage asset:effect Field.HealPerStack set value 2d diff --git a/Asset/data/asset/functions/effect/0270.honey_regeneration/tick/heal.mcfunction b/Asset/data/asset/functions/effect/0270.honey_regeneration/tick/heal.mcfunction index fd7e19b449..bf9c98a4ba 100644 --- a/Asset/data/asset/functions/effect/0270.honey_regeneration/tick/heal.mcfunction +++ b/Asset/data/asset/functions/effect/0270.honey_regeneration/tick/heal.mcfunction @@ -7,5 +7,6 @@ # 回復 data modify storage api: Argument.Heal set value 1.5f function api:heal/modifier + data modify storage api: Argument.ApplyTrigger set value false function api:heal/ function api:heal/reset diff --git a/Asset/data/asset/functions/effect/0279.poison_of_vinderre/tick/deal_damage.mcfunction b/Asset/data/asset/functions/effect/0279.poison_of_vinderre/tick/deal_damage.mcfunction index 0ba1d4f413..e863396346 100644 --- a/Asset/data/asset/functions/effect/0279.poison_of_vinderre/tick/deal_damage.mcfunction +++ b/Asset/data/asset/functions/effect/0279.poison_of_vinderre/tick/deal_damage.mcfunction @@ -14,6 +14,7 @@ data modify storage api: Argument.AttackType set value "Physical" data modify storage api: Argument.AdditionalMPHeal set from storage asset:context this.AdditionalMPHeal execute as @a if score @s UserID = $UserID Temporary run function api:damage/modifier + data modify storage api: Argument.ApplyTrigger set value false function api:damage/ function api:damage/reset # リセット diff --git a/Asset/data/asset/functions/effect/0301.soul_light/_/given.mcfunction b/Asset/data/asset/functions/effect/0301.soul_light/_/given.mcfunction new file mode 100644 index 0000000000..270bee6f8c --- /dev/null +++ b/Asset/data/asset/functions/effect/0301.soul_light/_/given.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0301.soul_light/_/given +# +# Effectが付与された時に実行されるfunction +# +# @within tag/function asset:effect/given + +execute if data storage asset:context {id:301} run function asset:effect/0301.soul_light/given/ \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0301.soul_light/_/re-given.mcfunction b/Asset/data/asset/functions/effect/0301.soul_light/_/re-given.mcfunction new file mode 100644 index 0000000000..9e7d618dcb --- /dev/null +++ b/Asset/data/asset/functions/effect/0301.soul_light/_/re-given.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0301.soul_light/_/re-given +# +# Effectが上書きされた時に実行されるfunction +# +# @within tag/function asset:effect/re-given + +execute if data storage asset:context {id:301} run function asset:effect/0301.soul_light/re-given/ \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0301.soul_light/_/register.mcfunction b/Asset/data/asset/functions/effect/0301.soul_light/_/register.mcfunction new file mode 100644 index 0000000000..62bfa4ee7e --- /dev/null +++ b/Asset/data/asset/functions/effect/0301.soul_light/_/register.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0301.soul_light/_/register +# +# +# +# @within tag/function asset:effect/register + +execute if data storage asset:context {id:301} run function asset:effect/0301.soul_light/register \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0301.soul_light/_/tick.mcfunction b/Asset/data/asset/functions/effect/0301.soul_light/_/tick.mcfunction new file mode 100644 index 0000000000..c61113e017 --- /dev/null +++ b/Asset/data/asset/functions/effect/0301.soul_light/_/tick.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0301.soul_light/_/tick +# +# Effectが発動している間毎tick実行されるfunction +# +# @within tag/function asset:effect/tick + +execute if data storage asset:context {id:301} run function asset:effect/0301.soul_light/tick/ \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0301.soul_light/given/.mcfunction b/Asset/data/asset/functions/effect/0301.soul_light/given/.mcfunction new file mode 100644 index 0000000000..4976bf2a84 --- /dev/null +++ b/Asset/data/asset/functions/effect/0301.soul_light/given/.mcfunction @@ -0,0 +1,9 @@ +#> asset:effect/0301.soul_light/given/ +# +# Effectが付与された時の処理 +# +# @within function asset:effect/0301.soul_light/_/given + +# Stack と Duration を保存しておく + data modify storage asset:context this.Stack set from storage asset:context Stack + data modify storage asset:context this.Duration set from storage asset:context Duration diff --git a/Asset/data/asset/functions/effect/0301.soul_light/re-given/.mcfunction b/Asset/data/asset/functions/effect/0301.soul_light/re-given/.mcfunction new file mode 100644 index 0000000000..cf853853ed --- /dev/null +++ b/Asset/data/asset/functions/effect/0301.soul_light/re-given/.mcfunction @@ -0,0 +1,32 @@ +#> asset:effect/0301.soul_light/re-given/ +# +# Effectが上書きされた時の処理 +# +# @within function asset:effect/0301.soul_light/_/re-given + +#> private +# @private + #declare score_holder $8D.Temp1 + #declare score_holder $8D.Temp2 + +# より Stack の大きい方を残す + # Stack を取得 + execute store result score $8D.Temp1 Temporary run data get storage asset:context PreviousField.Stack + execute store result score $8D.Temp2 Temporary run data get storage asset:context Stack + # より大きい方を残す + execute if score $8D.Temp1 Temporary >= $8D.Temp2 Temporary run data modify storage asset:context Stack set from storage asset:context PreviousField.Stack + execute if score $8D.Temp1 Temporary >= $8D.Temp2 Temporary run data modify storage asset:context Duration set from storage asset:context PreviousField.Duration + execute if score $8D.Temp1 Temporary >= $8D.Temp2 Temporary run data modify storage asset:context this.UserID set from storage asset:context PreviousField.UserID + execute if score $8D.Temp1 Temporary >= $8D.Temp2 Temporary run data modify storage asset:context this.Heal set from storage asset:context PreviousField.Heal + # execute if score $8D.Temp1 Temporary >= $8D.Temp2 Temporary run data modify storage asset:context this.Tick set value 20 + # execute unless score $8D.Temp1 Temporary >= $8D.Temp2 Temporary run data modify storage asset:context this.UserID set from storage asset:context this.UserID + # execute unless score $8D.Temp1 Temporary >= $8D.Temp2 Temporary run data modify storage asset:context this.Heal set from storage asset:context this.Heal + execute unless score $8D.Temp1 Temporary >= $8D.Temp2 Temporary run data modify storage asset:context this.Tick set value 20 + +# Stack と Duration を保存する + data modify storage asset:context this.Stack set from storage asset:context Stack + data modify storage asset:context this.Duration set from storage asset:context Duration + +# リセット + scoreboard players reset $8D.Temp1 Temporary + scoreboard players reset $8D.Temp2 Temporary diff --git a/Asset/data/asset/functions/effect/0301.soul_light/register.mcfunction b/Asset/data/asset/functions/effect/0301.soul_light/register.mcfunction new file mode 100644 index 0000000000..c4b3c00cd5 --- /dev/null +++ b/Asset/data/asset/functions/effect/0301.soul_light/register.mcfunction @@ -0,0 +1,43 @@ +#> asset:effect/0301.soul_light/register +# +# Effectのデータを指定 +# +# @within function asset:effect/0301.soul_light/_/register + +# ExtendsSafe (boolean) (default = false) + # data modify storage asset:effect ExtendsSafe set value true +# ID (int) + data modify storage asset:effect ID set value 301 +# 名前 (TextComponentString) + data modify storage asset:effect Name set value '{"text":"命魂の光","color":"aqua"}' +# 説明文 (TextComponentString[]) + data modify storage asset:effect Description set value ['{"text":"継続的に体力を回復する","color":"white"}'] +# 効果時間 (int) (default = API || error) + data modify storage asset:effect Duration set value 220 +# スタック (int) (default = API || 1) + # data modify storage asset:effect Stack set value +# 効果時間の操作方法 (default = API || "replace") + data modify storage asset:effect DurationOperation set value "forceReplace" +# スタックの操作方法 (default = API || "replace") + data modify storage asset:effect StackOperation set value "forceReplace" +# 最大効果時間 (int) (default = 2147483647) + data modify storage asset:effect MaxDuration set value 220 +# 最大スタック (int) (default = 2147483647) + data modify storage asset:effect MaxStack set value 3 +# 悪い効果か否か (boolean) + data modify storage asset:effect IsBadEffect set value false +# 死亡時のエフェクトの処理 (default = "remove") + # data modify storage asset:effect ProcessOnDied set value +# 消すのに必要なレベル (int) (default = 1) + data modify storage asset:effect RequireClearLv set value 3 +# エフェクトをUIに表示するか (boolean) (default = true) + # data modify storage asset:effect Visible set value +# エフェクトのスタックををUIに表示するか (boolean) (default = true) + # data modify storage asset:effect StackVisible set value + +# フィールド + # data modify storage asset:effect Field.Stack set value 1 + # data modify storage asset:effect Field.Duration set value 1 + data modify storage asset:effect Field.UserID set value -1 + data modify storage asset:effect Field.Heal set value 0 + data modify storage asset:effect Field.Tick set value 20 diff --git a/Asset/data/asset/functions/effect/0301.soul_light/tick/.mcfunction b/Asset/data/asset/functions/effect/0301.soul_light/tick/.mcfunction new file mode 100644 index 0000000000..3e5ab983f6 --- /dev/null +++ b/Asset/data/asset/functions/effect/0301.soul_light/tick/.mcfunction @@ -0,0 +1,14 @@ +#> asset:effect/0301.soul_light/tick/ +# +# Effectのtick処理 +# +# @within function asset:effect/0301.soul_light/_/tick + +# デクリメント + execute store result storage asset:context this.Tick int 0.9999999999 run data get storage asset:context this.Tick 1 +# 1 秒おきに回復 + execute if data storage asset:context this{Tick:0} run function asset:effect/0301.soul_light/tick/heal + execute if data storage asset:context this{Tick:0} run data modify storage asset:context this.Tick set value 20 + +# Duration を保存しておく + data modify storage asset:context this.Duration set from storage asset:context Duration diff --git a/Asset/data/asset/functions/effect/0301.soul_light/tick/heal.mcfunction b/Asset/data/asset/functions/effect/0301.soul_light/tick/heal.mcfunction new file mode 100644 index 0000000000..6ec46c84b1 --- /dev/null +++ b/Asset/data/asset/functions/effect/0301.soul_light/tick/heal.mcfunction @@ -0,0 +1,22 @@ +#> asset:effect/0301.soul_light/tick/heal +# +# +# +# @within function asset:effect/0301.soul_light/tick/ + +#> Private +# @private + #declare score_holder $UserID + +# 回復者のUserIDを取得 + execute store result score $UserID Temporary run data get storage asset:context this.UserID + +# 回復 + data modify storage api: Argument.Heal set from storage asset:context this.Heal + execute as @a if score @s UserID = $UserID Temporary run function api:heal/modifier + function api:heal/ + data modify storage api: Argument.ApplyTrigger set value false + function api:heal/reset + +# リセット + scoreboard players reset $UserID Temporary diff --git a/Asset/data/asset/functions/effect/0614.prominence_curse/tick/damage.mcfunction b/Asset/data/asset/functions/effect/0614.prominence_curse/tick/damage.mcfunction index a6e8d8e47f..ece8b336ad 100644 --- a/Asset/data/asset/functions/effect/0614.prominence_curse/tick/damage.mcfunction +++ b/Asset/data/asset/functions/effect/0614.prominence_curse/tick/damage.mcfunction @@ -23,6 +23,7 @@ data modify storage api: Argument.ElementType set value "Fire" data modify storage api: Argument.MobUUID set from storage asset:context this.MobUUID function api:damage/modifier_manual + data modify storage api: Argument.ApplyTrigger set value false function api:damage/ function api:damage/reset diff --git a/Asset/data/asset/functions/effect/0615.wave_curse/tick/damage.mcfunction b/Asset/data/asset/functions/effect/0615.wave_curse/tick/damage.mcfunction index f6155348cc..612ff5cf3a 100644 --- a/Asset/data/asset/functions/effect/0615.wave_curse/tick/damage.mcfunction +++ b/Asset/data/asset/functions/effect/0615.wave_curse/tick/damage.mcfunction @@ -24,6 +24,7 @@ function api:damage/modifier data modify storage api: Argument.MobUUID set from storage asset:context this.MobUUID function api:damage/modifier_manual + data modify storage api: Argument.ApplyTrigger set value false function api:damage/ function api:damage/reset diff --git a/Asset/data/asset/functions/effect/0616.lightning_curse/tick/damage.mcfunction b/Asset/data/asset/functions/effect/0616.lightning_curse/tick/damage.mcfunction index e3bc4a88d4..4fb61e9e33 100644 --- a/Asset/data/asset/functions/effect/0616.lightning_curse/tick/damage.mcfunction +++ b/Asset/data/asset/functions/effect/0616.lightning_curse/tick/damage.mcfunction @@ -23,6 +23,7 @@ data modify storage api: Argument.ElementType set value "Thunder" data modify storage api: Argument.MobUUID set from storage asset:context this.MobUUID function api:damage/modifier_manual + data modify storage api: Argument.ApplyTrigger set value false function api:damage/ function api:damage/reset diff --git a/Asset/data/asset/functions/effect/0620.ongaeshi/tick/heal.mcfunction b/Asset/data/asset/functions/effect/0620.ongaeshi/tick/heal.mcfunction index e95460de38..7753a08d77 100644 --- a/Asset/data/asset/functions/effect/0620.ongaeshi/tick/heal.mcfunction +++ b/Asset/data/asset/functions/effect/0620.ongaeshi/tick/heal.mcfunction @@ -9,5 +9,6 @@ data modify storage api: Argument.Heal set value 1.2 data modify storage api: Argument.FixedHeal set value true function api:heal/modifier + data modify storage api: Argument.ApplyTrigger set value false function api:heal/ function api:heal/reset diff --git a/Asset/data/asset/functions/mob/0147.prismarine_slayer/attack/.mcfunction b/Asset/data/asset/functions/mob/0147.prismarine_slayer/attack/.mcfunction index 81869c06b0..737b2e3158 100644 --- a/Asset/data/asset/functions/mob/0147.prismarine_slayer/attack/.mcfunction +++ b/Asset/data/asset/functions/mob/0147.prismarine_slayer/attack/.mcfunction @@ -23,7 +23,7 @@ # バフを解除 effect clear @p[tag=Victim,distance=..6] water_breathing - effect clear @p[tag=Victim,distance=..6] regeneration + execute as @p[tag=Victim,distance=..6] run function asset:mob/0147.prismarine_slayer/attack/clear_regen effect clear @p[tag=Victim,distance=..6] dolphins_grace # 与えるダメージ diff --git a/Asset/data/asset/functions/mob/0147.prismarine_slayer/attack/clear_regen.mcfunction b/Asset/data/asset/functions/mob/0147.prismarine_slayer/attack/clear_regen.mcfunction new file mode 100644 index 0000000000..df1ae0bbc7 --- /dev/null +++ b/Asset/data/asset/functions/mob/0147.prismarine_slayer/attack/clear_regen.mcfunction @@ -0,0 +1,17 @@ +#> asset:mob/0147.prismarine_slayer/attack/clear_regen +# +# +# +# @within function asset:mob/0147.prismarine_slayer/attack/ + +data modify storage api: Argument.ID set value 34 +function api:entity/mob/effect/remove/from_id + +data modify storage api: Argument.ID set value 84 +function api:entity/mob/effect/remove/from_id + +data modify storage api: Argument.ID set value 134 +function api:entity/mob/effect/remove/from_id + + +function api:entity/mob/effect/reset diff --git a/Asset/data/asset/functions/mob/0155.immorality/tick/shot/damage.mcfunction b/Asset/data/asset/functions/mob/0155.immorality/tick/shot/damage.mcfunction index 0381f097ab..3518144b4a 100644 --- a/Asset/data/asset/functions/mob/0155.immorality/tick/shot/damage.mcfunction +++ b/Asset/data/asset/functions/mob/0155.immorality/tick/shot/damage.mcfunction @@ -20,7 +20,7 @@ # 衰弱Lv2 function api:global_vars/get_difficulty data modify storage api: Argument set value {ID:80,Duration:160} - execute store result storage api: Argument.Stack int 3 run data get storage api: Return.Difficulty + execute store result storage api: Argument.Stack int 2 run data get storage api: Return.Difficulty function api:entity/mob/effect/give function api:entity/mob/effect/reset diff --git a/Asset/data/asset/functions/mob/0175.queen_bee/tick/skill_needle/4.skill_needle_landing.mcfunction b/Asset/data/asset/functions/mob/0175.queen_bee/tick/skill_needle/4.skill_needle_landing.mcfunction index 8c8bb9548e..dace582069 100644 --- a/Asset/data/asset/functions/mob/0175.queen_bee/tick/skill_needle/4.skill_needle_landing.mcfunction +++ b/Asset/data/asset/functions/mob/0175.queen_bee/tick/skill_needle/4.skill_needle_landing.mcfunction @@ -18,7 +18,7 @@ # 毒を付与する function api:global_vars/get_difficulty data modify storage api: Argument set value {ID:79,Duration:120} - execute store result storage api: Argument.Stack int 3 run data get storage api: Return.Difficulty + execute store result storage api: Argument.Stack int 2 run data get storage api: Return.Difficulty execute as @a[gamemode=!spectator,tag=LandingTarget,distance=..50,limit=1] run function api:entity/mob/effect/give function api:entity/mob/effect/reset diff --git a/Asset/data/asset/functions/mob/0236.ksitigarbha/death/2.1.curse.mcfunction b/Asset/data/asset/functions/mob/0236.ksitigarbha/death/2.1.curse.mcfunction index 24f51cfed5..ec472d6184 100644 --- a/Asset/data/asset/functions/mob/0236.ksitigarbha/death/2.1.curse.mcfunction +++ b/Asset/data/asset/functions/mob/0236.ksitigarbha/death/2.1.curse.mcfunction @@ -34,7 +34,7 @@ # 毒 # Stack = Difficulty data modify storage api: Argument set value {ID:29,Duration:100} - execute store result storage api: Argument.Stack int 1 run data get storage api: Return.Difficulty + execute store result storage api: Argument.Stack int 3 run data get storage api: Return.Difficulty execute as @e[type=#lib:living,tag=Friend,tag=!Uninterferable,distance=..5] run function api:entity/mob/effect/give function api:entity/mob/effect/reset diff --git a/Asset/data/asset/tags/functions/artifact/load.json b/Asset/data/asset/tags/functions/artifact/load.json index 6f251f8e0a..b78eb557ae 100644 --- a/Asset/data/asset/tags/functions/artifact/load.json +++ b/Asset/data/asset/tags/functions/artifact/load.json @@ -1,5 +1,6 @@ { "values": [ + "asset:artifact/0563.heartland/trigger/0.load", "asset:artifact/1174.sanguis/trigger/0.load", "asset:artifact/1088.purifying_hydrangea/trigger/0.load", "asset:artifact/1081.wandering_piece_of_dream/trigger/0.load", diff --git a/Asset/data/asset/tags/functions/artifact/tick.json b/Asset/data/asset/tags/functions/artifact/tick.json index af90af621a..697397d7fe 100644 --- a/Asset/data/asset/tags/functions/artifact/tick.json +++ b/Asset/data/asset/tags/functions/artifact/tick.json @@ -5,7 +5,7 @@ "asset:artifact/0954.inverted_parachute/trigger/1.trigger", "asset:artifact/1118.time_samsara/trigger/1.trigger", "asset:artifact/0928.ankh/trigger/1.trigger", - "asset:artifact/1057.great_demon_head/trigger/tick/1.trigger", + "asset:artifact/1057.great_demon_head/trigger/tick/", "asset:artifact/1074.farothdal/trigger/1.trigger", "asset:artifact/0963.hunters_amulet/trigger/1.trigger", "asset:artifact/1054.quick_charging_battery/trigger/1.trigger", diff --git a/Asset/data/asset/tags/functions/effect/end.json b/Asset/data/asset/tags/functions/effect/end.json index ab73649409..733f3d4a5d 100644 --- a/Asset/data/asset/tags/functions/effect/end.json +++ b/Asset/data/asset/tags/functions/effect/end.json @@ -1,5 +1,6 @@ { "values": [ + "asset:effect/0034.regeneration/_/end", "asset:effect/0313.firesprint/_/end", "asset:effect/0014.receive_heal_debuff/_/end", "asset:effect/0294.dance_with_hardluck/_/end", @@ -83,4 +84,4 @@ "asset:effect/0007.defense_base_debuff/_/end", "asset:effect/0258.spirit_melody/_/end" ] -} \ No newline at end of file +} diff --git a/Asset/data/asset/tags/functions/effect/given.json b/Asset/data/asset/tags/functions/effect/given.json index a7139e2fe7..7b9956b805 100644 --- a/Asset/data/asset/tags/functions/effect/given.json +++ b/Asset/data/asset/tags/functions/effect/given.json @@ -1,5 +1,6 @@ { "values": [ + "asset:effect/0301.soul_light/_/given", "asset:effect/0313.firesprint/_/given", "asset:effect/0014.receive_heal_debuff/_/given", "asset:effect/0293.beyond_the_speed/_/given", @@ -68,4 +69,4 @@ "asset:effect/0007.defense_base_debuff/_/given", "asset:effect/0258.spirit_melody/_/given" ] -} \ No newline at end of file +} diff --git a/Asset/data/asset/tags/functions/effect/load.json b/Asset/data/asset/tags/functions/effect/load.json index 033c612a40..d2e6bfd4ce 100644 --- a/Asset/data/asset/tags/functions/effect/load.json +++ b/Asset/data/asset/tags/functions/effect/load.json @@ -7,4 +7,4 @@ "asset:effect/0603.domination/load", "asset:effect/0258.spirit_melody/load" ] -} \ No newline at end of file +} diff --git a/Asset/data/asset/tags/functions/effect/re-given.json b/Asset/data/asset/tags/functions/effect/re-given.json index bbd3d2a0e4..77c797b6e8 100644 --- a/Asset/data/asset/tags/functions/effect/re-given.json +++ b/Asset/data/asset/tags/functions/effect/re-given.json @@ -1,5 +1,6 @@ { "values": [ + "asset:effect/0301.soul_light/_/re-given", "asset:effect/0014.receive_heal_debuff/_/re-given", "asset:effect/0308.healer_trance/_/re-given", "asset:effect/0309.healer_trance/_/re-given", @@ -32,4 +33,4 @@ "asset:effect/0007.defense_base_debuff/_/re-given", "asset:effect/0258.spirit_melody/_/re-given" ] -} \ No newline at end of file +} diff --git a/Asset/data/asset/tags/functions/effect/register.json b/Asset/data/asset/tags/functions/effect/register.json index 533e5eb125..d2e3374396 100644 --- a/Asset/data/asset/tags/functions/effect/register.json +++ b/Asset/data/asset/tags/functions/effect/register.json @@ -1,5 +1,10 @@ { "values": [ + "asset:effect/0301.soul_light/_/register", + "asset:effect/0266.grace_of_the_earth/_/register", + "asset:effect/0134.regeneration/_/register", + "asset:effect/0084.regeneration/_/register", + "asset:effect/0034.regeneration/_/register", "asset:effect/0313.firesprint/_/register", "asset:effect/0312.deadly_poison/_/register", "asset:effect/0305.poison_of_flowgun/_/register", @@ -114,4 +119,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/remove.json b/Asset/data/asset/tags/functions/effect/remove.json index 43400c91f8..7b5724f52c 100644 --- a/Asset/data/asset/tags/functions/effect/remove.json +++ b/Asset/data/asset/tags/functions/effect/remove.json @@ -1,5 +1,6 @@ { "values": [ + "asset:effect/0034.regeneration/_/remove", "asset:effect/0313.firesprint/_/remove", "asset:effect/0014.receive_heal_debuff/_/remove", "asset:effect/0294.dance_with_hardluck/_/remove", @@ -80,4 +81,4 @@ "asset:effect/0007.defense_base_debuff/_/remove", "asset:effect/0258.spirit_melody/_/remove" ] -} \ 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 1134d0b830..4886b1c03d 100644 --- a/Asset/data/asset/tags/functions/effect/tick.json +++ b/Asset/data/asset/tags/functions/effect/tick.json @@ -1,5 +1,7 @@ { "values": [ + "asset:effect/0301.soul_light/_/tick", + "asset:effect/0034.regeneration/_/tick", "asset:effect/0313.firesprint/_/tick", "asset:effect/0312.deadly_poison/_/tick", "asset:effect/0305.poison_of_flowgun/_/tick", @@ -71,4 +73,4 @@ "asset:effect/0279.poison_of_vinderre/_/tick", "asset:effect/0258.spirit_melody/_/tick" ] -} \ No newline at end of file +}