Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Asset/data/asset/functions/artifact/1054.quick_charging_battery/give/2.give.mcfunction
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) (オプション)
Expand Down
6 changes: 3 additions & 3 deletions Asset/data/asset/functions/artifact/1054.quick_charging_battery/trigger/3.main.mcfunction
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion Asset/data/asset/functions/effect/0214.quick_charge/register.mcfunction
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
14 changes: 13 additions & 1 deletion Asset/data/asset/functions/effect/0214.quick_charge/tick/.mcfunction
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Loading