♻️ 雪玉系Objectの処理を重力飛翔体抽象を継承する仕様に変更#1857
Merged
Merged
Conversation
haiiro2gou
requested changes
Feb 18, 2026
haiiro2gou
approved these changes
May 16, 2026
Contributor
There was a problem hiding this comment.
Pull request overview
Issue #1809 対応として、雪玉系 Object 群を 0005.abstract_gravity_projectile 継承ベースの処理（super 呼び出し／メソッド化／Tick を Field に寄せる）へ移行し、個別実装の重複（init/tick/boom など）を整理するPRです。
Changes:
0005.abstract_gravity_projectileに「寿命(Tick)」概念とkill/range_overのメソッドを追加し、雪玉系 Object を Extends=5 に統一- 各 Object 側の tick/init 直書きを削減し、
super.tick/super.method経由の共通処理に寄せる - Artifact 側の召喚時に
FieldOverride.Tick/Motionを明示し、寿命・挙動を新仕様に合わせる
Reviewed changes
Copilot reviewed 89 out of 89 changed files in this pull request and generated 1 comment.
Show a summary per file
| File | Description |
|---|---|
| Asset/data/asset/functions/object/alias/5/range_over.mcfunction | 0005 の range_over 呼び出し用エイリアス追加 |
| Asset/data/asset/functions/object/alias/5/kill.mcfunction | 0005 の kill 呼び出し用エイリアス追加 |
| Asset/data/asset/functions/object/alias/1139/tick.mcfunction | tick エイリアス削除 |
| Asset/data/asset/functions/object/alias/1139/init.mcfunction | init エイリアス削除 |
| Asset/data/asset/functions/object/alias/1139/hit.mcfunction | hit メソッド呼び出しエイリアス追加 |
| Asset/data/asset/functions/object/alias/1110/range_over.mcfunction | range_over メソッド呼び出しエイリアス追加 |
| Asset/data/asset/functions/object/alias/1110/init.mcfunction | init エイリアス削除 |
| Asset/data/asset/functions/object/alias/1110/hit.mcfunction | hit メソッド呼び出しエイリアス追加 |
| Asset/data/asset/functions/object/alias/1106/kill.mcfunction | kill メソッド呼び出しエイリアス追加 |
| Asset/data/asset/functions/object/alias/1106/init.mcfunction | init エイリアス削除 |
| Asset/data/asset/functions/object/alias/1086/tick.mcfunction | tick エイリアス削除 |
| Asset/data/asset/functions/object/alias/1086/range_over.mcfunction | range_over メソッド呼び出しエイリアス追加 |
| Asset/data/asset/functions/object/alias/1086/init.mcfunction | init エイリアス削除 |
| Asset/data/asset/functions/object/alias/1086/hit.mcfunction | hit メソッド呼び出しエイリアス追加 |
| Asset/data/asset/functions/object/alias/1053/summon.mcfunction | summon エイリアス削除 |
| Asset/data/asset/functions/object/alias/1053/range_over.mcfunction | range_over メソッド呼び出しエイリアス追加 |
| Asset/data/asset/functions/object/alias/1053/init.mcfunction | init エイリアス削除 |
| Asset/data/asset/functions/object/alias/1053/hit.mcfunction | hit メソッド呼び出しエイリアス追加 |
| Asset/data/asset/functions/object/alias/1041/summon.mcfunction | summon エイリアス削除 |
| Asset/data/asset/functions/object/alias/1041/init.mcfunction | init エイリアス削除 |
| Asset/data/asset/functions/object/alias/1041/hit.mcfunction | hit メソッド呼び出しエイリアス追加 |
| Asset/data/asset/functions/object/alias/1002/init.mcfunction | init エイリアス削除 |
| Asset/data/asset/functions/object/alias/1002/hit.mcfunction | hit メソッド呼び出しエイリアス追加 |
| Asset/data/asset/functions/object/1139.simple_grenade/tick/.mcfunction | tick 実装削除 |
| Asset/data/asset/functions/object/1139.simple_grenade/register.mcfunction | Extends=5 と Field.Tick 追加 |
| Asset/data/asset/functions/object/1139.simple_grenade/init/.mcfunction | init 実装削除 |
| Asset/data/asset/functions/object/1139.simple_grenade/hit/.mcfunction | hit をメソッドとして整理し super 呼び出し追加 |
| Asset/data/asset/functions/object/1110.heavy_lava_bomb/tick/before_boom.mcfunction | tick 内の before_boom 分離を削除（hit 側へ移設） |
| Asset/data/asset/functions/object/1110.heavy_lava_bomb/tick/.mcfunction | 個別 tick ロジックを簡略化し super.tick 呼び出しへ |
| Asset/data/asset/functions/object/1110.heavy_lava_bomb/register.mcfunction | Extends=5、Field.Tick など追加 |
| Asset/data/asset/functions/object/1110.heavy_lava_bomb/range_over/.mcfunction | range_over で hit 呼び出しへ接続 |
| Asset/data/asset/functions/object/1110.heavy_lava_bomb/init/.mcfunction | init 実装削除 |
| Asset/data/asset/functions/object/1110.heavy_lava_bomb/hit/boom.mcfunction | boom の @within/ヘッダ整理 |
| Asset/data/asset/functions/object/1110.heavy_lava_bomb/hit/before_boom.mcfunction | hit フェーズ用 before_boom 新規追加 |
| Asset/data/asset/functions/object/1110.heavy_lava_bomb/hit/.mcfunction | hit フェーズの進行（Tick で段階制御）を新規追加 |
| Asset/data/asset/functions/object/1106.sparkle_bomb/tick/.mcfunction | 個別 tick を簡略化し super.tick 呼び出しへ |
| Asset/data/asset/functions/object/1106.sparkle_bomb/register.mcfunction | Extends=5、Field.Tick 追加 |
| Asset/data/asset/functions/object/1106.sparkle_bomb/kill/.mcfunction | tick/boom 相当を kill メソッドへ整理し super 呼び出し追加 |
| Asset/data/asset/functions/object/1106.sparkle_bomb/init/.mcfunction | init 実装削除 |
| Asset/data/asset/functions/object/1086.lightning_exploit/tick/vfx/vfx.m.mcfunction | 旧 tick 側 vfx マクロ削除（hit 側へ） |
| Asset/data/asset/functions/object/1086.lightning_exploit/tick/.mcfunction | tick 実装削除 |
| Asset/data/asset/functions/object/1086.lightning_exploit/summon/debug.mcfunction | デバッグ召喚削除 |
| Asset/data/asset/functions/object/1086.lightning_exploit/register.mcfunction | Extends=5 と Field 群（Motion/Tick/Damage/UserID）追加 |
| Asset/data/asset/functions/object/1086.lightning_exploit/range_over/.mcfunction | range_over の消滅処理追加 |
| Asset/data/asset/functions/object/1086.lightning_exploit/init/.mcfunction | init 実装削除 |
| Asset/data/asset/functions/object/1086.lightning_exploit/hit/vfx/random.mcfunction | hit 側 vfx 呼び出しへ更新 |
| Asset/data/asset/functions/object/1086.lightning_exploit/hit/vfx/random.m.mcfunction | hit 側 vfx 用マクロ新規追加 |
| Asset/data/asset/functions/object/1086.lightning_exploit/hit/vfx/particle.mcfunction | @within/パスを hit 側へ更新 |
| Asset/data/asset/functions/object/1086.lightning_exploit/hit/.mcfunction | landing を hit メソッドへ整理、UserID 処理も再構成 |
| Asset/data/asset/functions/object/1086.lightning_exploit/_index.d.mcfunction | Owner タグ宣言削除 |
| Asset/data/asset/functions/object/1053.flamethrower_ball/tick/hit.mcfunction | 旧 hit 実装削除（hit メソッドへ） |
| Asset/data/asset/functions/object/1053.flamethrower_ball/tick/.mcfunction | 個別 tick を簡略化し super.tick 呼び出しへ |
| Asset/data/asset/functions/object/1053.flamethrower_ball/summon/debug.mcfunction | デバッグ召喚削除 |
| Asset/data/asset/functions/object/1053.flamethrower_ball/summon/.mcfunction | summon 実装削除 |
| Asset/data/asset/functions/object/1053.flamethrower_ball/register.mcfunction | Extends=5 と Field 群（Motion/Tick/Damage/UserID）追加 |
| Asset/data/asset/functions/object/1053.flamethrower_ball/range_over/.mcfunction | range_over の消滅処理追加 |
| Asset/data/asset/functions/object/1053.flamethrower_ball/init/.mcfunction | init 実装削除 |
| Asset/data/asset/functions/object/1053.flamethrower_ball/hit/.mcfunction | hit メソッド新規追加（ダメージ処理） |
| Asset/data/asset/functions/object/1053.flamethrower_ball/_index.d.mcfunction | タグ宣言削除 |
| Asset/data/asset/functions/object/1041.grand_flame/tick/vfx/landing/random.m.mcfunction | 旧 landing 側マクロ削除（hit 側へ） |
| Asset/data/asset/functions/object/1041.grand_flame/tick/vfx.mcfunction | vfx 関数のヘッダ/名前整理 |
| Asset/data/asset/functions/object/1041.grand_flame/tick/.mcfunction | 個別 tick を簡略化し super.tick 呼び出しへ |
| Asset/data/asset/functions/object/1041.grand_flame/summon/m.mcfunction | summon マクロ削除 |
| Asset/data/asset/functions/object/1041.grand_flame/summon/.mcfunction | summon 実装削除 |
| Asset/data/asset/functions/object/1041.grand_flame/register.mcfunction | Extends=5 と Field.Tick 追加 |
| Asset/data/asset/functions/object/1041.grand_flame/init/.mcfunction | init 実装削除 |
| Asset/data/asset/functions/object/1041.grand_flame/hit/vfx/random.mcfunction | hit 側 vfx へ更新 |
| Asset/data/asset/functions/object/1041.grand_flame/hit/vfx/random.m.mcfunction | hit 側 vfx 用マクロ新規追加 |
| Asset/data/asset/functions/object/1041.grand_flame/hit/vfx/.mcfunction | hit 側 vfx へ更新 |
| Asset/data/asset/functions/object/1041.grand_flame/hit/.mcfunction | landing を hit メソッドへ整理し super 呼び出し追加 |
| Asset/data/asset/functions/object/1002.malleus_maleficarum/tick/hit.mcfunction | 旧 hit 実装削除（hit メソッドへ） |
| Asset/data/asset/functions/object/1002.malleus_maleficarum/tick/.mcfunction | 個別 tick を簡略化し super.tick 呼び出しへ |
| Asset/data/asset/functions/object/1002.malleus_maleficarum/register.mcfunction | Extends=5 と Field.Motion/Tick 追加 |
| Asset/data/asset/functions/object/1002.malleus_maleficarum/init/.mcfunction | init 実装削除 |
| Asset/data/asset/functions/object/1002.malleus_maleficarum/hit/witchification.mcfunction | @within/パスを hit 側へ更新 |
| Asset/data/asset/functions/object/1002.malleus_maleficarum/hit/.mcfunction | hit メソッド新規追加（魔女化） |
| Asset/data/asset/functions/object/0005.abstract_gravity_projectile/tick/.mcfunction | hit 呼び出し＋寿命(Tick)デクリメント＋range_over 呼び出し追加 |
| Asset/data/asset/functions/object/0005.abstract_gravity_projectile/register.mcfunction | Field.Tick デフォルト追加 |
| Asset/data/asset/functions/object/0005.abstract_gravity_projectile/range_over/.mcfunction | range_over メソッド新規追加（現状 kill 呼び出し） |
| Asset/data/asset/functions/object/0005.abstract_gravity_projectile/kill/.mcfunction | kill メソッド新規追加（雪玉＋自身 kill） |
| Asset/data/asset/functions/object/0005.abstract_gravity_projectile/hit/.mcfunction | hit から kill メソッド呼び出しへ変更 |
| Asset/data/asset/functions/artifact/1264.simple_grenade/trigger/throw.mcfunction | 召喚時に FieldOverride.Tick を追加 |
| Asset/data/asset/functions/artifact/1206.triple_sparkle_bomb/trigger/throw_bomb.mcfunction | 召喚時に FieldOverride.Tick を追加 |
| Asset/data/asset/functions/artifact/1197.heavy_lava_bomb/trigger/throw_bomb.mcfunction | 召喚時に FieldOverride.Tick を追加 |
| Asset/data/asset/functions/artifact/1120.flamethrower/trigger/shoot.mcfunction | 新しい射撃（拡散→Object 召喚）関数を追加 |
| Asset/data/asset/functions/artifact/1120.flamethrower/trigger/3.main.mcfunction | 召喚処理を shoot 関数に委譲 |
| Asset/data/asset/functions/artifact/1037.grand_flame/trigger/3.main.mcfunction | 召喚時に FieldOverride.Tick を追加 |
| Asset/data/asset/functions/artifact/0464.lightning_exploit/trigger/3.main.mcfunction | 召喚時に FieldOverride.Tick/Motion を追加 |
| Asset/data/asset/functions/artifact/0035.malleus_maleficarum/trigger/3.main.mcfunction | 召喚時に FieldOverride.Tick/Motion を追加 |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
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.
Fix #1809