✨ [Artifact 1364 - 1366] かき氷(イチゴ、ブルーハワイ、メロン)を作成 #1898
Open
Lapis-LJA wants to merge 5 commits into
Open
Conversation
haiiro2gou
approved these changes
May 23, 2026
Contributor
There was a problem hiding this comment.
Pull request overview
かき氷(イチゴ/ブルーハワイ/メロン)の神器(Artifact 1364–1366)と、それらが付与する新規エフェクト「清涼感」(Effect 0348)を追加し、既存のタグ実行フロー（artifact/use_item・artifact/give・artifact/register、effect/*）へ組み込むPRです。
Changes:
- Effect 0348「cool_feeling」を新規追加し、register/given/re-given/tick/end/remove の各イベントで動作するfunction群を実装
- Artifact 1364–1366（かき氷3種）を新規追加し、取得(give)・使用(trigger)を実装
- effect系/ artifact系の各tag JSONに新規function参照を追加
Reviewed changes
Copilot reviewed 47 out of 47 changed files in this pull request and generated 13 comments.
Show a summary per file
| File | Description |
|---|---|
| Asset/data/asset/tags/functions/effect/tick.json | Effect 0348 の tick dispatcher をtagに追加 |
| Asset/data/asset/tags/functions/effect/remove.json | Effect 0348 の remove dispatcher をtagに追加 |
| Asset/data/asset/tags/functions/effect/register.json | Effect 0348 の register dispatcher をtagに追加 |
| Asset/data/asset/tags/functions/effect/re-given.json | Effect 0348 の re-given dispatcher をtagに追加 |
| Asset/data/asset/tags/functions/effect/given.json | Effect 0348 の given dispatcher をtagに追加 |
| Asset/data/asset/tags/functions/effect/end.json | Effect 0348 の end dispatcher をtagに追加 |
| Asset/data/asset/tags/functions/artifact/use_item.json | かき氷3種の itemUse トリガーをtagに追加 |
| Asset/data/asset/tags/functions/artifact/register.json | かき氷3種の登録functionをtagに追加 |
| Asset/data/asset/tags/functions/artifact/give.json | かき氷3種のgiveトリガーをtagに追加 |
| Asset/data/asset/functions/effect/0348.cool_feeling/tick/.mcfunction | 清涼感のtick演出(粒子) |
| Asset/data/asset/functions/effect/0348.cool_feeling/remove/.mcfunction | 清涼感の削除時に補正を解除 |
| Asset/data/asset/functions/effect/0348.cool_feeling/register.mcfunction | 清涼感のEffectメタデータ定義(ID/Name/Duration等) |
| Asset/data/asset/functions/effect/0348.cool_feeling/re-given/.mcfunction | 上書き時に補正を更新(remove→add) |
| Asset/data/asset/functions/effect/0348.cool_feeling/modifier/remove.mcfunction | 水攻撃補正の解除 |
| Asset/data/asset/functions/effect/0348.cool_feeling/modifier/add.mcfunction | スタックに応じた水攻撃補正の付与 |
| Asset/data/asset/functions/effect/0348.cool_feeling/given/.mcfunction | 付与時に補正を追加 |
| Asset/data/asset/functions/effect/0348.cool_feeling/end/.mcfunction | 期限終了時に補正を解除 |
| Asset/data/asset/functions/effect/0348.cool_feeling/_/tick.mcfunction | tag(effect/tick) からのID振り分け |
| Asset/data/asset/functions/effect/0348.cool_feeling/_/remove.mcfunction | tag(effect/remove) からのID振り分け |
| Asset/data/asset/functions/effect/0348.cool_feeling/_/register.mcfunction | tag(effect/register) からのID振り分け |
| Asset/data/asset/functions/effect/0348.cool_feeling/_/re-given.mcfunction | tag(effect/re-given) からのID振り分け |
| Asset/data/asset/functions/effect/0348.cool_feeling/_/given.mcfunction | tag(effect/given) からのID振り分け |
| Asset/data/asset/functions/effect/0348.cool_feeling/_/end.mcfunction | tag(effect/end) からのID振り分け |
| Asset/data/asset/functions/artifact/1366.shaved_ice_melon/trigger/heal_and_buff.mcfunction | メロンかき氷: 回復+清涼感付与 |
| Asset/data/asset/functions/artifact/1366.shaved_ice_melon/trigger/damage_and_clear_buff.mcfunction | メロンかき氷: バフ解除+固定ダメージ |
| Asset/data/asset/functions/artifact/1366.shaved_ice_melon/trigger/3.main.mcfunction | メロンかき氷: スタック判定のメイン処理 |
| Asset/data/asset/functions/artifact/1366.shaved_ice_melon/trigger/2.check_condition.mcfunction | メロンかき氷: 使用条件チェック |
| Asset/data/asset/functions/artifact/1366.shaved_ice_melon/trigger/1.trigger.mcfunction | メロンかき氷: itemUseトリガー入口 |
| Asset/data/asset/functions/artifact/1366.shaved_ice_melon/register.mcfunction | メロンかき氷: 神器プール登録処理 |
| Asset/data/asset/functions/artifact/1366.shaved_ice_melon/give/2.give.mcfunction | メロンかき氷: アイテム定義(ID/名前/Lore等) |
| Asset/data/asset/functions/artifact/1366.shaved_ice_melon/give/1.trigger.mcfunction | メロンかき氷: give入口(コンテキストid一致で作成) |
| Asset/data/asset/functions/artifact/1365.shaved_ice_blue_hawaii/trigger/heal_and_buff.mcfunction | ブルーハワイ: 回復+清涼感付与 |
| Asset/data/asset/functions/artifact/1365.shaved_ice_blue_hawaii/trigger/damage_and_clear_buff.mcfunction | ブルーハワイ: バフ解除+固定ダメージ |
| Asset/data/asset/functions/artifact/1365.shaved_ice_blue_hawaii/trigger/3.main.mcfunction | ブルーハワイ: スタック判定のメイン処理 |
| Asset/data/asset/functions/artifact/1365.shaved_ice_blue_hawaii/trigger/2.check_condition.mcfunction | ブルーハワイ: 使用条件チェック |
| Asset/data/asset/functions/artifact/1365.shaved_ice_blue_hawaii/trigger/1.trigger.mcfunction | ブルーハワイ: itemUseトリガー入口 |
| Asset/data/asset/functions/artifact/1365.shaved_ice_blue_hawaii/register.mcfunction | ブルーハワイ: 神器プール登録処理 |
| Asset/data/asset/functions/artifact/1365.shaved_ice_blue_hawaii/give/2.give.mcfunction | ブルーハワイ: アイテム定義(ID/名前/Lore等) |
| Asset/data/asset/functions/artifact/1365.shaved_ice_blue_hawaii/give/1.trigger.mcfunction | ブルーハワイ: give入口(コンテキストid一致で作成) |
| Asset/data/asset/functions/artifact/1364.shaved_ice_strawberry/trigger/heal_and_buff.mcfunction | イチゴ: 回復+清涼感付与 |
| Asset/data/asset/functions/artifact/1364.shaved_ice_strawberry/trigger/damage_and_clear_buff.mcfunction | イチゴ: バフ解除+固定ダメージ |
| Asset/data/asset/functions/artifact/1364.shaved_ice_strawberry/trigger/3.main.mcfunction | イチゴ: スタック判定のメイン処理 |
| Asset/data/asset/functions/artifact/1364.shaved_ice_strawberry/trigger/2.check_condition.mcfunction | イチゴ: 使用条件チェック |
| Asset/data/asset/functions/artifact/1364.shaved_ice_strawberry/trigger/1.trigger.mcfunction | イチゴ: itemUseトリガー入口 |
| Asset/data/asset/functions/artifact/1364.shaved_ice_strawberry/register.mcfunction | イチゴ: 神器プール登録処理 |
| Asset/data/asset/functions/artifact/1364.shaved_ice_strawberry/give/2.give.mcfunction | イチゴ: アイテム定義(ID/名前/Lore等) |
| Asset/data/asset/functions/artifact/1364.shaved_ice_strawberry/give/1.trigger.mcfunction | イチゴ: give入口(コンテキストid一致で作成) |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Comment on lines
+21
to
+27
| # スタックの操作方法 (default = API || "replace") | ||
| data modify storage asset:effect StackOperation set value "add" | ||
| # 最大効果時間 (int) (default = 2147483647) | ||
| # data modify storage asset:effect MaxDuration set value | ||
| # 最大スタック (int) (default = 2147483647) | ||
| # data modify storage asset:effect MaxStack set value 3 | ||
| # 悪い効果か否か (boolean) |
| # @within tag/function asset:artifact/register | ||
|
|
||
| # 加工機ではなく日替わり商人に登録する | ||
| # data modify storage asset:artifact RarityRegistry[4] append value [1366] |
| # @within tag/function asset:artifact/register | ||
|
|
||
| # 加工機ではなく日替わり商人に登録する | ||
| # data modify storage asset:artifact RarityRegistry[4] append value [1365] |
| # @within tag/function asset:artifact/register | ||
|
|
||
| # 加工機ではなく日替わり商人に登録する | ||
| # data modify storage asset:artifact RarityRegistry[4] append value [1364] |
| # スタックがNでないなら回復とバフ | ||
| execute unless data storage api: Return.Effect{Stack:2} run function asset:artifact/1365.shaved_ice_blue_hawaii/trigger/heal_and_buff | ||
|
|
||
| # スタックがNなら回復とバフ |
| # スタックがNでないなら回復とバフ | ||
| execute unless data storage api: Return.Effect{Stack:2} run function asset:artifact/1364.shaved_ice_strawberry/trigger/heal_and_buff | ||
|
|
||
| # スタックがNなら回復とバフ |
Member
|
nits: Copilot 君のレビューのうちやったほうが良さそうなところだけ残したので、後はご自由に |
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.