✨ Killトリガーで超過ダメージを取得できるように#2173
Open
Lapis-LJA wants to merge 1 commit into
Open
Conversation
haiiro2gou
approved these changes
May 20, 2026
Member
haiiro2gou
left a comment
haiiro2gou
left a comment
There was a problem hiding this comment.
まあよさそう
隕石を落とさなくてよければ楽なんだけどな～～～
Contributor
There was a problem hiding this comment.
Pull request overview
Kill トリガーで「超過ダメージ（オーバーキル分）」を取得できるようにするため、Kill イベントのダメージ格納形式を拡張し、Health 減算時のクランプ処理を調整する変更です。
Changes:
- Kill イベントの
AmountをBase/Overに分割して storage に格納 - Mob への HP 減算処理で「Damage を Health にクランプする」処理を無効化し、超過分が
Healthに反映されるように変更
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 3 comments.
| File | Description |
|---|---|
TheSkyBlessing/data/api/functions/damage/core/trigger_events/non-player/kill_and_death/kill.mcfunction |
Killed イベントに Amount.Base と Amount.Over を格納するように変更 |
TheSkyBlessing/data/api/functions/damage/core/health_subtract/non-player/.mcfunction |
overkill を発生させるため $Damage < $Health クランプをコメントアウト |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Comment on lines
+11
to
+12
| execute store result storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].ArtifactEvents.Killed[-1].Amount.Base double 0.01 run scoreboard players get $Damage Temporary | ||
| execute store result storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].ArtifactEvents.Killed[-1].Amount.Over double -0.01 run scoreboard players get $Health Temporary |
| data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].ArtifactEvents.Killed append value {Type: "api",IsVanilla:false} | ||
| execute store result storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].ArtifactEvents.Killed[-1].To int 1 run scoreboard players get $DamagerUUID Temporary | ||
| execute store result storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].ArtifactEvents.Killed[-1].Amount double 0.01 run scoreboard players get $Damage Temporary | ||
| execute store result storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].ArtifactEvents.Killed[-1].Amount.Base double 0.01 run scoreboard players get $Damage Temporary |
|
|
||
| # MobのHealthよりダメージが高い場合Healthに設定 | ||
| scoreboard players operation $Damage Temporary < $Health Temporary | ||
| # scoreboard players operation $Damage Temporary < $Health Temporary |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.