Skip to content

⚖️ ダメージ上限の引き上げ#1635

Open
haiiro2gou wants to merge 10 commits into
masterfrom
dev/haiiro_damage-overlimit
Open

⚖️ ダメージ上限の引き上げ#1635
haiiro2gou wants to merge 10 commits into
masterfrom
dev/haiiro_damage-overlimit

Conversation

@haiiro2gou

@haiiro2gou haiiro2gou commented Nov 17, 2024

Copy link
Copy Markdown
Member

計算処理を弄ってダメージ上限を 9999.9 -> 99999.9 に上げました

@haiiro2gou haiiro2gou requested a review from ChenCMD as a code owner November 17, 2024 16:54
@ChenCMD

ChenCMD commented Nov 17, 2024

Copy link
Copy Markdown
Member

要審議

@ChenCMD ChenCMD closed this Nov 27, 2024
@haiiro2gou haiiro2gou deleted the dev/haiiro_damage-overlimit branch March 25, 2025 10:32
@haiiro2gou haiiro2gou restored the dev/haiiro_damage-overlimit branch January 1, 2026 17:59
@haiiro2gou

Copy link
Copy Markdown
Member Author

物理炎とアポカリプスが可哀想なので闘う

@haiiro2gou haiiro2gou reopened this Jan 1, 2026
Copilot AI review requested due to automatic review settings February 19, 2026 05:47

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

ダメージ上限を引き上げるために、ダメージ計算側の上限値や軽減計算(防御・耐性)まわりを調整し、最終的な強制キャップ処理を共通関数として導入するPRです。

Changes:

  • 最終段でのダメージ上限適用を health_subtract/force_cap に集約し、player / non-player 両経路から呼び出すよう変更
  • 計算中の安全上限(オーバーフロー回避用)を 10 倍に引き上げ、軽減計算の式・スケーリングを調整
  • 攻撃処理に tellraw が追加され、ダメージスコアを出力する挙動が入っている

Reviewed changes

Copilot reviewed 8 out of 8 changed files in this pull request and generated 3 comments.

Show a summary per file
File Description
TheSkyBlessing/data/api/functions/damage/core/health_subtract/player/difficulty_modifier.mcfunction 難易度補正内のキャップ処理を撤去(キャップを共通関数へ移動)
TheSkyBlessing/data/api/functions/damage/core/health_subtract/player/.mcfunction player 側のHP減算前に force_cap を適用
TheSkyBlessing/data/api/functions/damage/core/health_subtract/non-player/.mcfunction non-player 側のHP減算前に force_cap を適用
TheSkyBlessing/data/api/functions/damage/core/health_subtract/force_cap.mcfunction 新規:システム的なダメージ上限の強制キャップ関数
TheSkyBlessing/data/api/functions/damage/core/calc/resistance.mcfunction 耐性の計算式コメント更新(ただし実装と不一致あり)
TheSkyBlessing/data/api/functions/damage/core/calc/defense.mcfunction 防御計算を高ダメージ前提で再構成・スケーリング調整
TheSkyBlessing/data/api/functions/damage/core/calc/.mcfunction 計算中の安全上限(オーバーフロー回避用)を引き上げ、式コメントを更新
TheSkyBlessing/data/api/functions/damage/core/attack.mcfunction modifier 前の storage 受け渡しスケール変更、tellraw 追加、旧キャップ処理を削除

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Comment thread TheSkyBlessing/data/api/functions/damage/core/attack.mcfunction Outdated
Comment thread TheSkyBlessing/data/api/functions/damage/core/calc/resistance.mcfunction Outdated
@haiiro2gou haiiro2gou force-pushed the dev/haiiro_damage-overlimit branch from 7728784 to a379cf1 Compare February 19, 2026 06:46
@haiiro2gou haiiro2gou changed the title 🧑‍💻 ダメージ上限の引き上げ ⚖️ ダメージ上限の引き上げ Jun 22, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants