From 008606a10b2984eb25b1d832eced2af3a8e8e97a Mon Sep 17 00:00:00 2001 From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com> Date: Thu, 8 Aug 2024 22:25:50 +0900 Subject: [PATCH] =?UTF-8?q?[=E7=A5=9E=E5=99=A81054]=20=E6=80=A5=E9=80=9F?= =?UTF-8?q?=E5=85=85=E9=9B=BB=E3=83=90=E3=83=83=E3=83=86=E3=83=AA=E3=83=BC?= =?UTF-8?q?=E3=81=AE=E4=BB=95=E6=A7=98=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../give/2.give.mcfunction | 2 +- .../trigger/3.main.mcfunction | 6 +++--- .../effect/0214.quick_charge/register.mcfunction | 2 +- .../effect/0214.quick_charge/tick/.mcfunction | 14 +++++++++++++- 4 files changed, 18 insertions(+), 6 deletions(-) diff --git a/Asset/data/asset/functions/artifact/1054.quick_charging_battery/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1054.quick_charging_battery/give/2.give.mcfunction index f88b188c72..15cb66ee1f 100644 --- a/Asset/data/asset/functions/artifact/1054.quick_charging_battery/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/1054.quick_charging_battery/give/2.give.mcfunction @@ -15,7 +15,7 @@ # 神器の名前 (TextComponentString) data modify storage asset:artifact Name set value '{"text":"急速充電バッテリー","color":"yellow"}' # 神器の説明文 (TextComponentString[]) - data modify storage asset:artifact Lore set value ['{"text":"発動時、MPを最大値の50%分回復し、","color":"white"}','{"text":"雷攻撃+15%とMP回復量+15%を10秒間得る。","color":"white"}','{"text":"我が社の誇るこのバッテリーなら、","color":"gray"}','{"text":"充電切れ間近でもすぐに回復して差し上げます！","color":"gray"}'] + data modify storage asset:artifact Lore set value ['{"text":"MPを急速に50%分回復し、雷攻撃+15%を10秒間得る。","color":"white"}','{"text":"我が社の誇るこのバッテリーなら、","color":"gray"}','{"text":"充電切れ間近でもすぐに回復して差し上げます！","color":"gray"}'] # MP以外の消費物 (TextComponentString) (オプション) # data modify storage asset:artifact CostText set value # 使用回数 (int) (オプション) diff --git a/Asset/data/asset/functions/artifact/1054.quick_charging_battery/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/1054.quick_charging_battery/trigger/3.main.mcfunction index 644b60e756..11be21dc65 100644 --- a/Asset/data/asset/functions/artifact/1054.quick_charging_battery/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/1054.quick_charging_battery/trigger/3.main.mcfunction @@ -17,9 +17,9 @@ function api:mp/get_max # MPを最大値の50%分回復する - execute store result score $Fluctuation Lib run data get storage api: Return.MaxMP 0.5 - function lib:mp/fluctuation + #execute store result score $Fluctuation Lib run data get storage api: Return.MaxMP 0.5 + #function lib:mp/fluctuation # 急速充電を付与 data modify storage api: Argument.ID set value 214 - function api:entity/mob/effect/give \ No newline at end of file + function api:entity/mob/effect/give diff --git a/Asset/data/asset/functions/effect/0214.quick_charge/register.mcfunction b/Asset/data/asset/functions/effect/0214.quick_charge/register.mcfunction index e6fe1f98ee..40729445ac 100644 --- a/Asset/data/asset/functions/effect/0214.quick_charge/register.mcfunction +++ b/Asset/data/asset/functions/effect/0214.quick_charge/register.mcfunction @@ -11,7 +11,7 @@ # 名前 (TextComponentString) data modify storage asset:effect Name set value '{"text":"急速充電","color":"yellow"}' # 説明文 (TextComponentString[]) - data modify storage asset:effect Description set value '{"text":"与える雷属性ダメージとMP回復量が上昇する"}' + data modify storage asset:effect Description set value '{"text":"継続的にMPを回復し、雷属性与ダメージが上昇する"}' # 効果時間 (int) (default = API || error) data modify storage asset:effect Duration set value 200 # スタック (int) (default = API || 1) diff --git a/Asset/data/asset/functions/effect/0214.quick_charge/tick/.mcfunction b/Asset/data/asset/functions/effect/0214.quick_charge/tick/.mcfunction index 0bfe733f66..4f8cc6a14a 100644 --- a/Asset/data/asset/functions/effect/0214.quick_charge/tick/.mcfunction +++ b/Asset/data/asset/functions/effect/0214.quick_charge/tick/.mcfunction @@ -4,5 +4,17 @@ # # @within function asset:effect/0214.quick_charge/_/tick +#> Private +# @private + #declare score_holder $Interval + # 演出 - particle electric_spark ~ ~1.2 ~ 0.8 0.6 0.8 0 2 normal @a \ No newline at end of file + particle electric_spark ~ ~1.2 ~ 0.8 0.6 0.8 0 2 normal @a + +# 4tickに1回MPを1%回復する + execute store result score $Interval Temporary run data get storage asset:context Duration + scoreboard players operation $Interval Temporary %= $4 Const + execute if score $Interval Temporary matches 0 run function api:mp/get_max + execute if score $Interval Temporary matches 0 store result storage api: Argument.Fluctuation double 0.01 run data get storage api: Return.MaxMP + execute if score $Interval Temporary matches 0 run function api:mp/fluctuation + scoreboard players reset $Interval