Skip to content

Commit

Permalink
⚖️ [Artifact 90-94] 使用条件を MP から攻略度に変更
Browse files Browse the repository at this point in the history
  • Loading branch information
haiiro2gou committed Mar 5, 2025
1 parent d5b0dd3 commit 47c45d6
Show file tree
Hide file tree
Showing 9 changed files with 70 additions and 15 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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
execute if entity @s[tag=CanUsed] run function asset:artifact/0090.leather_armor_set/trigger/3.main
Original file line number Diff line number Diff line change
Expand Up @@ -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を参照 (オプション)
Expand All @@ -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}) (オプション)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
execute if entity @s[tag=CanUsed] run function asset:artifact/0091.iron_armor_set/trigger/3.main
Original file line number Diff line number Diff line change
Expand Up @@ -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を参照 (オプション)
Expand All @@ -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}) (オプション)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
execute if entity @s[tag=CanUsed] run function asset:artifact/0092.golden_armor_set/trigger/3.main
Original file line number Diff line number Diff line change
Expand Up @@ -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を参照 (オプション)
Expand All @@ -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}) (オプション)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
execute if entity @s[tag=CanUsed] run function asset:artifact/0093.diamond_armor_set/trigger/3.main
Original file line number Diff line number Diff line change
Expand Up @@ -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を参照 (オプション)
Expand All @@ -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}) (オプション)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
execute if entity @s[tag=CanUsed] run function asset:artifact/0094.netherite_armor_set/trigger/3.main

0 comments on commit 47c45d6

Please sign in to comment.