[神器1054] 急速充電バッテリーの仕様変更

ProjectTSB · Aug 8, 2024 · 008606a · 008606a
1 parent 1b23c7d
commit 008606a
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 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
@@ -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
@@ -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
+    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
@@ -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
@@ -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
+    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