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

🐛 [Artifact 73] スズランチャームのダメージ表記が正しくないのを修正 #1067

Merged
merged 2 commits into from
Mar 7, 2025
Merged

🐛 [Artifact 73] スズランチャームのダメージ表記が正しくないのを修正 #1067

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3861244
ダメージ表記を修正
Lapis-LJA Mar 7, 2025
803fb44
コンバラトキシンのダメージの定義を神器側で行うように
Lapis-LJA Mar 7, 2025
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/0073.suzuran_charm/give/2.give.mcfunction
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
# 神器の発動条件 (TextComponentString) (オプション)
data modify storage asset:artifact Condition set value '[{"translate":"block.minecraft.lily_of_the_valley"},{"text":"を所持している"}]'
# 攻撃に関する情報 -Damage量 (literal[]/literal) Wikiを参照 (オプション)
data modify storage asset:artifact AttackInfo.Damage set value [200]
data modify storage asset:artifact AttackInfo.Damage set value "50+25x8"
# 攻撃に関する情報 -攻撃タイプ (string[]) Wikiを参照 (オプション)
data modify storage asset:artifact AttackInfo.AttackType set value [Physical]
# 攻撃に関する情報 -攻撃属性 (string[]) Wikiを参照 (オプション)
Expand Down
1 change: 1 addition & 0 deletions Asset/data/asset/functions/artifact/0073.suzuran_charm/trigger/3.main.mcfunction
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@

# 敵にコンバラトキシンを付与
data modify storage api: Argument.ID set value 205
data modify storage api: Argument.FieldOverride.Damage set value 25
execute store result storage api: Argument.FieldOverride.AppliedFrom int 1 run scoreboard players get @s UserID
execute as @e[type=#lib:living,type=!player,tag=Victim,distance=..10] run function api:entity/mob/effect/give
function api:entity/mob/effect/reset
Expand Down
2 changes: 1 addition & 1 deletion Asset/data/asset/functions/effect/0205.convallatoxin/tick/deal_damage.mcfunction
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

# ダメージを与える
execute store result score $AppliedFrom Temporary run data get storage asset:context this.AppliedFrom
data modify storage api: Argument.Damage set value 25.0f
data modify storage api: Argument.Damage set from storage asset:context this.Damage
data modify storage api: Argument.AttackType set value "Physical"
execute as @a if score @s UserID = $AppliedFrom Temporary run function api:damage/modifier
function api:damage/
Expand Down