From 47c45d66b739aa05df05842f4a9e5ae1f92893f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=AF=E3=81=84=E3=81=84=E3=82=8D?= Date: Thu, 6 Mar 2025 06:14:54 +0900 Subject: [PATCH] =?UTF-8?q?:balance=5Fscale:=20[Artifact=2090-94]=20?= =?UTF-8?q?=E4=BD=BF=E7=94=A8=E6=9D=A1=E4=BB=B6=E3=82=92=20MP=20=E3=81=8B?= =?UTF-8?q?=E3=82=89=E6=94=BB=E7=95=A5=E5=BA=A6=E3=81=AB=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../trigger/2.check_condition.mcfunction | 13 ++++++++++++- .../0091.iron_armor_set/give/2.give.mcfunction | 4 ++-- .../trigger/2.check_condition.mcfunction | 13 ++++++++++++- .../give/2.give.mcfunction | 4 ++-- .../trigger/2.check_condition.mcfunction | 13 ++++++++++++- .../give/2.give.mcfunction | 4 ++-- .../trigger/2.check_condition.mcfunction | 13 ++++++++++++- .../give/2.give.mcfunction | 4 ++-- .../trigger/2.check_condition.mcfunction | 17 ++++++++++++++--- 9 files changed, 70 insertions(+), 15 deletions(-) diff --git a/Asset/data/asset/functions/artifact/0090.leather_armor_set/trigger/2.check_condition.mcfunction b/Asset/data/asset/functions/artifact/0090.leather_armor_set/trigger/2.check_condition.mcfunction index f108d70e1e..cb83615de3 100644 --- a/Asset/data/asset/functions/artifact/0090.leather_armor_set/trigger/2.check_condition.mcfunction +++ b/Asset/data/asset/functions/artifact/0090.leather_armor_set/trigger/2.check_condition.mcfunction @@ -4,9 +4,20 @@ # # @within function asset:artifact/0090.leather_armor_set/trigger/1.trigger +#> private +# @private + #declare score_holder $Progress + # 神器の基本的な条件の確認を行うfunction、成功している場合CanUsedタグが付く auto/feet/legs/chest/head/mainhand/offhandを記載してね function asset:artifact/common/check_condition/auto # 他にアイテム等確認する場合はここに書く +# 攻略度チェック + # function api:global_vars/game_progress + # execute store result score $Progress Temporary run data get storage api: Return.Progress 100 + # execute unless score $Progress Temporary matches 0.. run tellraw @s [{"text":"この神器を解凍するには攻略度が","color":"white"},{"text":"\u0002","font":"space"},{"text":"0%","font":"default","color":"aqua"},{"text":"\u0002","font":"space"},{"text":"必要なようだ...","font":"default","color":"white"}] + # execute unless score $Progress Temporary matches 0.. run tag @s remove CanUsed + # scoreboard players reset $Progress Temporary + # CanUsedタグをチェックして3.main.mcfunctionを実行する - execute if entity @s[tag=CanUsed] run function asset:artifact/0090.leather_armor_set/trigger/3.main \ No newline at end of file + execute if entity @s[tag=CanUsed] run function asset:artifact/0090.leather_armor_set/trigger/3.main diff --git a/Asset/data/asset/functions/artifact/0091.iron_armor_set/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0091.iron_armor_set/give/2.give.mcfunction index ae8deeb709..734672593f 100644 --- a/Asset/data/asset/functions/artifact/0091.iron_armor_set/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0091.iron_armor_set/give/2.give.mcfunction @@ -27,7 +27,7 @@ # 神器のトリガー (string) Wikiを参照 data modify storage asset:artifact Trigger set value "onClick" # 神器の発動条件 (TextComponentString) (オプション) - # data modify storage asset:artifact Condition set value + data modify storage asset:artifact Condition set value '[{"text":"攻略度"},{"text":"\\u0002","font":"space"},{"text":"20%"}]' # 攻撃に関する情報 -Damage量 (literal[]/literal) Wikiを参照 (オプション) # data modify storage asset:artifact AttackInfo.Damage set value [0,0] # 攻撃に関する情報 -攻撃タイプ (string[]) Wikiを参照 (オプション) @@ -43,7 +43,7 @@ # MP消費量 (int) data modify storage asset:artifact MPCost set value 0 # MP必要量 (int) (オプション) - data modify storage asset:artifact MPRequire set value 120 + # data modify storage asset:artifact MPRequire set value 120 # 神器のクールダウン (int) (オプション) # data modify storage asset:artifact LocalCooldown set value # 種別クールダウン ({Type: string, Duration: int}) (オプション) diff --git a/Asset/data/asset/functions/artifact/0091.iron_armor_set/trigger/2.check_condition.mcfunction b/Asset/data/asset/functions/artifact/0091.iron_armor_set/trigger/2.check_condition.mcfunction index 2b1f1192f9..ffec576d68 100644 --- a/Asset/data/asset/functions/artifact/0091.iron_armor_set/trigger/2.check_condition.mcfunction +++ b/Asset/data/asset/functions/artifact/0091.iron_armor_set/trigger/2.check_condition.mcfunction @@ -4,9 +4,20 @@ # # @within function asset:artifact/0091.iron_armor_set/trigger/1.trigger +#> private +# @private + #declare score_holder $Progress + # 神器の基本的な条件の確認を行うfunction、成功している場合CanUsedタグが付く auto/feet/legs/chest/head/mainhand/offhandを記載してね function asset:artifact/common/check_condition/auto # 他にアイテム等確認する場合はここに書く +# 攻略度チェック + function api:global_vars/game_progress + execute store result score $Progress Temporary run data get storage api: Return.Progress 100 + execute unless score $Progress Temporary matches 20.. run tellraw @s [{"text":"この神器を解凍するには攻略度が","color":"white"},{"text":"\u0002","font":"space"},{"text":"20%","font":"default","color":"aqua"},{"text":"\u0002","font":"space"},{"text":"必要なようだ...","font":"default","color":"white"}] + execute unless score $Progress Temporary matches 20.. run tag @s remove CanUsed + scoreboard players reset $Progress Temporary + # CanUsedタグをチェックして3.main.mcfunctionを実行する - execute if entity @s[tag=CanUsed] run function asset:artifact/0091.iron_armor_set/trigger/3.main \ No newline at end of file + execute if entity @s[tag=CanUsed] run function asset:artifact/0091.iron_armor_set/trigger/3.main diff --git a/Asset/data/asset/functions/artifact/0092.golden_armor_set/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0092.golden_armor_set/give/2.give.mcfunction index 14262bcab6..c56b4ca89f 100644 --- a/Asset/data/asset/functions/artifact/0092.golden_armor_set/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0092.golden_armor_set/give/2.give.mcfunction @@ -27,7 +27,7 @@ # 神器のトリガー (string) Wikiを参照 data modify storage asset:artifact Trigger set value "onClick" # 神器の発動条件 (TextComponentString) (オプション) - # data modify storage asset:artifact Condition set value + data modify storage asset:artifact Condition set value '[{"text":"攻略度"},{"text":"\\u0002","font":"space"},{"text":"20%"}]' # 攻撃に関する情報 -Damage量 (literal[]/literal) Wikiを参照 (オプション) # data modify storage asset:artifact AttackInfo.Damage set value [0,0] # 攻撃に関する情報 -攻撃タイプ (string[]) Wikiを参照 (オプション) @@ -43,7 +43,7 @@ # MP消費量 (int) data modify storage asset:artifact MPCost set value 0 # MP必要量 (int) (オプション) - data modify storage asset:artifact MPRequire set value 150 + # data modify storage asset:artifact MPRequire set value 150 # 神器のクールダウン (int) (オプション) # data modify storage asset:artifact LocalCooldown set value # 種別クールダウン ({Type: string, Duration: int}) (オプション) diff --git a/Asset/data/asset/functions/artifact/0092.golden_armor_set/trigger/2.check_condition.mcfunction b/Asset/data/asset/functions/artifact/0092.golden_armor_set/trigger/2.check_condition.mcfunction index 54a296c680..e834b82fc6 100644 --- a/Asset/data/asset/functions/artifact/0092.golden_armor_set/trigger/2.check_condition.mcfunction +++ b/Asset/data/asset/functions/artifact/0092.golden_armor_set/trigger/2.check_condition.mcfunction @@ -4,9 +4,20 @@ # # @within function asset:artifact/0092.golden_armor_set/trigger/1.trigger +#> private +# @private + #declare score_holder $Progress + # 神器の基本的な条件の確認を行うfunction、成功している場合CanUsedタグが付く auto/feet/legs/chest/head/mainhand/offhandを記載してね function asset:artifact/common/check_condition/auto # 他にアイテム等確認する場合はここに書く +# 攻略度チェック + function api:global_vars/game_progress + execute store result score $Progress Temporary run data get storage api: Return.Progress 100 + execute unless score $Progress Temporary matches 20.. run tellraw @s [{"text":"この神器を解凍するには攻略度が","color":"white"},{"text":"\u0002","font":"space"},{"text":"20%","font":"default","color":"aqua"},{"text":"\u0002","font":"space"},{"text":"必要なようだ...","font":"default","color":"white"}] + execute unless score $Progress Temporary matches 20.. run tag @s remove CanUsed + scoreboard players reset $Progress Temporary + # CanUsedタグをチェックして3.main.mcfunctionを実行する - execute if entity @s[tag=CanUsed] run function asset:artifact/0092.golden_armor_set/trigger/3.main \ No newline at end of file + execute if entity @s[tag=CanUsed] run function asset:artifact/0092.golden_armor_set/trigger/3.main diff --git a/Asset/data/asset/functions/artifact/0093.diamond_armor_set/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0093.diamond_armor_set/give/2.give.mcfunction index f3c73d97e3..03e28e86cd 100644 --- a/Asset/data/asset/functions/artifact/0093.diamond_armor_set/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0093.diamond_armor_set/give/2.give.mcfunction @@ -27,7 +27,7 @@ # 神器のトリガー (string) Wikiを参照 data modify storage asset:artifact Trigger set value "onClick" # 神器の発動条件 (TextComponentString) (オプション) - # data modify storage asset:artifact Condition set value + data modify storage asset:artifact Condition set value '[{"text":"攻略度"},{"text":"\\u0002","font":"space"},{"text":"50%"}]' # 攻撃に関する情報 -Damage量 (literal[]/literal) Wikiを参照 (オプション) # data modify storage asset:artifact AttackInfo.Damage set value [0,0] # 攻撃に関する情報 -攻撃タイプ (string[]) Wikiを参照 (オプション) @@ -43,7 +43,7 @@ # MP消費量 (int) data modify storage asset:artifact MPCost set value 0 # MP必要量 (int) (オプション) - data modify storage asset:artifact MPRequire set value 180 + # data modify storage asset:artifact MPRequire set value 180 # 神器のクールダウン (int) (オプション) # data modify storage asset:artifact LocalCooldown set value # 種別クールダウン ({Type: string, Duration: int}) (オプション) diff --git a/Asset/data/asset/functions/artifact/0093.diamond_armor_set/trigger/2.check_condition.mcfunction b/Asset/data/asset/functions/artifact/0093.diamond_armor_set/trigger/2.check_condition.mcfunction index 05f0a4d5a1..e5cc7eec81 100644 --- a/Asset/data/asset/functions/artifact/0093.diamond_armor_set/trigger/2.check_condition.mcfunction +++ b/Asset/data/asset/functions/artifact/0093.diamond_armor_set/trigger/2.check_condition.mcfunction @@ -4,9 +4,20 @@ # # @within function asset:artifact/0093.diamond_armor_set/trigger/1.trigger +#> private +# @private + #declare score_holder $Progress + # 神器の基本的な条件の確認を行うfunction、成功している場合CanUsedタグが付く auto/feet/legs/chest/head/mainhand/offhandを記載してね function asset:artifact/common/check_condition/auto # 他にアイテム等確認する場合はここに書く +# 攻略度チェック + function api:global_vars/game_progress + execute store result score $Progress Temporary run data get storage api: Return.Progress 100 + execute unless score $Progress Temporary matches 50.. run tellraw @s [{"text":"この神器を解凍するには攻略度が","color":"white"},{"text":"\u0002","font":"space"},{"text":"50%","font":"default","color":"aqua"},{"text":"\u0002","font":"space"},{"text":"必要なようだ...","font":"default","color":"white"}] + execute unless score $Progress Temporary matches 50.. run tag @s remove CanUsed + scoreboard players reset $Progress Temporary + # CanUsedタグをチェックして3.main.mcfunctionを実行する - execute if entity @s[tag=CanUsed] run function asset:artifact/0093.diamond_armor_set/trigger/3.main \ No newline at end of file + execute if entity @s[tag=CanUsed] run function asset:artifact/0093.diamond_armor_set/trigger/3.main diff --git a/Asset/data/asset/functions/artifact/0094.netherite_armor_set/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0094.netherite_armor_set/give/2.give.mcfunction index fe4ebb0b0d..6023cf224c 100644 --- a/Asset/data/asset/functions/artifact/0094.netherite_armor_set/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0094.netherite_armor_set/give/2.give.mcfunction @@ -27,7 +27,7 @@ # 神器のトリガー (string) Wikiを参照 data modify storage asset:artifact Trigger set value "onClick" # 神器の発動条件 (TextComponentString) (オプション) - # data modify storage asset:artifact Condition set value + data modify storage asset:artifact Condition set value '[{"text":"攻略度"},{"text":"\\u0002","font":"space"},{"text":"80%"}]' # 攻撃に関する情報 -Damage量 (literal[]/literal) Wikiを参照 (オプション) # data modify storage asset:artifact AttackInfo.Damage set value [0,0] # 攻撃に関する情報 -攻撃タイプ (string[]) Wikiを参照 (オプション) @@ -43,7 +43,7 @@ # MP消費量 (int) data modify storage asset:artifact MPCost set value 0 # MP必要量 (int) (オプション) - data modify storage asset:artifact MPRequire set value 210 + # data modify storage asset:artifact MPRequire set value 210 # 神器のクールダウン (int) (オプション) # data modify storage asset:artifact LocalCooldown set value # 種別クールダウン ({Type: string, Duration: int}) (オプション) diff --git a/Asset/data/asset/functions/artifact/0094.netherite_armor_set/trigger/2.check_condition.mcfunction b/Asset/data/asset/functions/artifact/0094.netherite_armor_set/trigger/2.check_condition.mcfunction index 2ffff63ba1..61aaeb4555 100644 --- a/Asset/data/asset/functions/artifact/0094.netherite_armor_set/trigger/2.check_condition.mcfunction +++ b/Asset/data/asset/functions/artifact/0094.netherite_armor_set/trigger/2.check_condition.mcfunction @@ -4,9 +4,20 @@ # # @within function asset:artifact/0094.netherite_armor_set/trigger/1.trigger -# 神器の基本的な条件の確認を行うfunction、成功している場合CanUsedタグが付く +#> private +# @private + #declare score_holder $Progress + +# 神器の基本的な条件の確認を行うfunction、成功している場合CanUsedタグが付く auto/feet/legs/chest/head/mainhand/offhandを記載してね function asset:artifact/common/check_condition/auto # 他にアイテム等確認する場合はここに書く - + +# 攻略度チェック + function api:global_vars/game_progress + execute store result score $Progress Temporary run data get storage api: Return.Progress 100 + execute unless score $Progress Temporary matches 80.. run tellraw @s [{"text":"この神器を解凍するには攻略度が","color":"white"},{"text":"\u0002","font":"space"},{"text":"80%","font":"default","color":"aqua"},{"text":"\u0002","font":"space"},{"text":"必要なようだ...","font":"default","color":"white"}] + execute unless score $Progress Temporary matches 80.. run tag @s remove CanUsed + scoreboard players reset $Progress Temporary + # CanUsedタグをチェックして3.main.mcfunctionを実行する - execute if entity @s[tag=CanUsed] run function asset:artifact/0094.netherite_armor_set/trigger/3.main \ No newline at end of file + execute if entity @s[tag=CanUsed] run function asset:artifact/0094.netherite_armor_set/trigger/3.main