Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
db8484b
1430の神器のgiveとtriggerの処理を作った
k22992068-crypto May 20, 2026
8e44114
🩹 使用しない0.loadファイルの削除
k22992068-crypto May 21, 2026
4c76cb1
✨ [Artifact 1430]運命の盾を作成
k22992068-crypto May 21, 2026
f3ab7f0
🎨 [Artifact 1430] 勇気の盾のメイントリガーの変更
k22992068-crypto May 22, 2026
9e3edcc
✨ [Artifact 1430] 勇気の盾の装備時エフェクトの作成
k22992068-crypto May 23, 2026
619e4d3
✨ [Artifact 1430] 勇気の盾のデバフの作成&装備効果の実装
k22992068-crypto May 24, 2026
4dbb315
🩹 [Artifact 1430] 勇気の盾のエフェクトの表示を有効化
k22992068-crypto May 28, 2026
5923530
🐛[Artifact 1430] 勇気の盾が低体力時に装備したときバフが付く問題を修正
k22992068-crypto Jun 3, 2026
bfce416
🩹[Artifact 1430] 勇気の盾のエフェクト付与時のコメントを修正
k22992068-crypto Jun 3, 2026
5c06a59
🐛[Artifact 1430] 勇気の盾を装備して死亡したときにバフが付与されない問題を修正
k22992068-crypto Jun 3, 2026
9cf22bd
Merge branch 'master' into dev/mizame_1430
k22992068-crypto Jun 3, 2026
e260994
🎨 [Artifact 1430] 勇気の盾の未使用スコアを削除
k22992068-crypto Jun 3, 2026
c9471e3
🐛[Artifact 1430] 勇気の盾が信仰をチェックしていない問題を修正
k22992068-crypto Jun 5, 2026
f12b220
🩹 [Artifact 1430] 勇気の盾のいらない@sを削除
k22992068-crypto Jun 5, 2026
acc6587
🐛[Artifact 1430] 勇気の盾の音量をplayerに変更
k22992068-crypto Jun 5, 2026
23dbe4a
🎨[Artifact 1430] 勇気の盾のエフェクト付与処理を一つにまとめるように変更
k22992068-crypto Jun 5, 2026
2ba0911
🐛[Artifact 1430] 勇気の盾が進行を変更時バフが削除されない問題の修正
k22992068-crypto Jun 5, 2026
c3850e8
🩹[Artifact 1430] 勇気の盾のエフェクト効果説明文を微修正
k22992068-crypto Jun 5, 2026
7ebb52c
🎨[Artifact 1430] 勇気の盾の補正値を神器側で設定できるように変更
k22992068-crypto Jun 5, 2026
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
#> asset:artifact/1430.shield_of_fate/effect/buff_give
#
# バフの付与
#
# @within function
# asset:artifact/1430.shield_of_fate/trigger/3.main
# asset:artifact/1430.shield_of_fate/tick/check_buff

#>バフ付与
data modify storage api: Argument.ID set value 354
data modify storage api: Argument.FieldOverride.Amount set value 0.15
function api:entity/mob/effect/give
function api:entity/mob/effect/reset
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
#> asset:artifact/1430.shield_of_fate/effect/buff_remove
#
# バフの削除
#
# @within function
# asset:artifact/1430.shield_of_fate/tick/check_debuff
# asset:artifact/1430.shield_of_fate/tick/2.check_condition

#>バフ削除
data modify storage api: Argument.ID set value 354
function api:entity/mob/effect/remove/from_id
function api:entity/mob/effect/reset
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
#> asset:artifact/1430.shield_of_fate/effect/debuff_give
#
# デバフの付与
#
# @within function
# asset:artifact/1430.shield_of_fate/trigger/3.main
# asset:artifact/1430.shield_of_fate/tick/check_debuff

#>デバフ付与
data modify storage api: Argument.ID set value 355
data modify storage api: Argument.FieldOverride.Amount set value -0.15
function api:entity/mob/effect/give
function api:entity/mob/effect/reset
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
#> asset:artifact/1430.shield_of_fate/effect/debuff_remove
#
# デバフの削除
#
# @within function
# asset:artifact/1430.shield_of_fate/tick/check_buff
# asset:artifact/1430.shield_of_fate/tick/2.check_condition

#>デバフ削除
data modify storage api: Argument.ID set value 355
function api:entity/mob/effect/remove/from_id
function api:entity/mob/effect/reset
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
#> asset:artifact/1430.shield_of_fate/give/1.trigger
#
# 神器の取得処理の呼び出し時に実行されるfunction
#
# @within tag/function asset:artifact/give

execute if data storage asset:context {id:1430} run function asset:artifact/1430.shield_of_fate/give/2.give
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
#> asset:artifact/1430.shield_of_fate/give/2.give
#
# 神器の作成部 ここでID等を定義する
#
# @user
# @within function asset:artifact/1430.shield_of_fate/give/1.trigger

# 神器の説明や消費MPなどをここで設定する。
# 最後にasset:artifact/common/giveを実行することで入手可能。

# 神器のID (int) スプレッドシートの値を入れる
data modify storage asset:artifact ID set value 1430
# 神器のベースアイテム
data modify storage asset:artifact Item set value "minecraft:stick"
# 神器の名前 (TextComponentString)
data modify storage asset:artifact Name set value '[{"text":"運命","color":"#3E53FF"},{"text":"の","color":"#737FFF"},{"text":"盾","color":"#8DB2FC"}]'
# 神器の説明文 (TextComponentString[])
data modify storage asset:artifact Lore set value ['[{"text":"装備すると耐性が15%上昇するが、"}]','[{"text":"体力が30%以下になると逆に耐性が15%低下する"}]','[{"text":"肝心な時にあなたを護るのは心。忘れないでよね","color":"gray","italic":true}]']
# 消費アイテム ({Item: TextComponent, Count: int, Extra?: TextComponent}) (オプション)
# data modify storage asset:artifact ConsumeItem.Item set value '{"translate":"item.minecraft.stick"}'
# data modify storage asset:artifact ConsumeItem.Count set value 1
# data modify storage asset:artifact ConsumeItem.Extra set value
# 使用回数 (int) (オプション)
# data modify storage asset:artifact RemainingCount set value
# 神器を発動できるスロット (string) Wikiを参照
data modify storage asset:artifact Slot set value "hotbar"
# 神器のトリガー (string) Wikiを参照
data modify storage asset:artifact Trigger set value "passive"
# 効果が重複可能か否か (boolean) (オプション)
# data modify storage asset:artifact EnableDuplication set value
# 神器の発動条件 (TextComponentString) (オプション)
# data modify storage asset:artifact Condition set value
# 攻撃に関する情報 -Damage量 (literal[]/literal) Wikiを参照 (オプション)
# data modify storage asset:artifact AttackInfo.Damage set value [0,0]
# 攻撃に関する情報 -攻撃タイプ (string[]) Wikiを参照 (オプション)
# data modify storage asset:artifact AttackInfo.AttackType set value [Physical,Magic]
# 攻撃に関する情報 -攻撃属性 (string[]) Wikiを参照 (オプション)
# data modify storage asset:artifact AttackInfo.ElementType set value [Fire,Water,Thunder,None]
# 攻撃に関する情報 -防御無視 (boolean) Wikiを参照 (オプション)
# data modify storage asset:artifact AttackInfo.BypassResist set value
# 攻撃に関する情報 -範囲攻撃 (string) Wikiを参照 (オプション)
# data modify storage asset:artifact AttackInfo.IsRangeAttack set value
# 攻撃に関する情報 -攻撃範囲 (literal) Wikiを参照 (オプション)
# data modify storage asset:artifact AttackInfo.AttackRange set value
# MP消費量 (int)
data modify storage asset:artifact MPCost set value 120
# MP必要量 (int) (オプション)
data modify storage asset:artifact MPRequire set value 0
# MP回復量 (int)
# data modify storage asset:artifact MPHealWhenHit set value
# 神器のクールダウン (int) (オプション)
# data modify storage asset:artifact LocalCooldown set value
# 種別クールダウン ({Type: string, Duration: int}) (オプション)
# data modify storage asset:artifact TypeCooldown.Type set value
# data modify storage asset:artifact TypeCooldown.Duration set value
# 第二種別クールダウン ({Type: string, Duration: int}) (オプション)
# data modify storage asset:artifact SecondaryTypeCooldown.Type set value
# data modify storage asset:artifact SecondaryTypeCooldown.Duration set value
# グローバルクールダウン (int) (オプション)
# data modify storage asset:artifact SpecialCooldown set value
# クールダウンによる使用不可のメッセージを非表示にするか否か (boolean) (オプション)
# data modify storage asset:artifact DisableCooldownMessage set value
# MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション)
# data modify storage asset:artifact DisableMPMessage set value
# 破壊時の音を鳴らさないかどうか (boolean) (オプション)
# data modify storage asset:artifact DisableBreakSound set value
# 装備時ステータス補正 ({Type: string, Amount: double, Operation: string, StackReduction?: double}[]) (オプション)
# data modify storage asset:artifact Equipment.Modifiers append value {Type:"defense/base",Amount:0.15d,Operation:"multiply_base"}
# 扱える神 (string[]) Wikiを参照
data modify storage asset:artifact CanUsedGod set value ["Flora","Rumor"]
# カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション)
# data modify storage asset:artifact CustomNBT set value {}
# 神器の入手用function
function asset:artifact/common/give
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
#> asset:artifact/1430.shield_of_fate/register
#
# 神器プールへの登録処理
#
# @within tag/function asset:artifact/register

data modify storage asset:artifact RarityRegistry[3] append value [1430]
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
#> asset:artifact/1430.shield_of_fate/tick/1.trigger
#
# 装備を装備時に装備した部位にのみのidが入った状態でトリガーされる
#
# @within tag/function asset:artifact/**

execute if data storage asset:context id{hotbar:[1430]} run function asset:artifact/1430.shield_of_fate/tick/2.check_condition
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.

これ信仰とかチェックしてなくない?

Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
#> asset:artifact/1430.shield_of_fate/tick/2.check_condition
#
# 神器の発動条件のチェック
#
# @within function asset:artifact/1430.shield_of_fate/tick/1.trigger

# ID指定する
data modify storage asset:artifact TargetID set value 1430
# 神器の基本的な条件の確認を行うfunction、成功している場合CanUsedタグが付く
function asset:artifact/common/check_condition/hotbar

# 使用できない場合バフ、デバフを削除する
execute if entity @s[tag=!CanUsed] run function asset:artifact/1430.shield_of_fate/effect/buff_remove
execute if entity @s[tag=!CanUsed] run function asset:artifact/1430.shield_of_fate/effect/debuff_remove
# 使用できなければリターン
execute if entity @s[tag=!CanUsed] run return fail

# 現在体力割合を取得する
function api:entity/player/get_health_per
execute store result score $13Q.HealthPer Temporary run data get storage api: Return.HealthPer 1000

# 体力が30%以下
execute if score $13Q.HealthPer Temporary matches ..300 run function asset:artifact/1430.shield_of_fate/tick/check_debuff
# 体力が30%以下でない
execute unless score $13Q.HealthPer Temporary matches ..300 run function asset:artifact/1430.shield_of_fate/tick/check_buff

# リセット
scoreboard players reset $13Q.HealthPer Temporary
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
#> asset:artifact/1430.shield_of_fate/tick/check_buff
#
# デバフが付与されていれば削除しバフ付与の処理を行う
#
# @within function asset:artifact/1430.shield_of_fate/tick/2.check_condition

# buff(ID 354)を検索する
data modify storage api: Argument.ID set value 354
function api:entity/mob/effect/get/from_id

# 付与されていなかったら実行
execute unless data storage api: Return.Effect run function asset:artifact/1430.shield_of_fate/effect/buff_give
execute unless data storage api: Return.Effect run function asset:artifact/1430.shield_of_fate/effect/debuff_remove
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
#> asset:artifact/1430.shield_of_fate/tick/check_debuff
#
# バフが付与されていれば削除しデバフ付与の処理を行う
#
# @within function asset:artifact/1430.shield_of_fate/tick/2.check_condition

# debuff(ID 355)を検索する
data modify storage api: Argument.ID set value 355
function api:entity/mob/effect/get/from_id

# 付与されていなかったら実行
execute unless data storage api: Return.Effect run function asset:artifact/1430.shield_of_fate/effect/debuff_give
execute unless data storage api: Return.Effect run function asset:artifact/1430.shield_of_fate/effect/buff_remove
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
#> asset:artifact/1430.shield_of_fate/trigger/1.trigger
#
# 装備を装備時に装備した部位にのみのidが入った状態でトリガーされる
#
# @within tag/function asset:artifact/equip

execute if data storage asset:context id{hotbar:[1430]} run function asset:artifact/1430.shield_of_fate/trigger/2.check_condition
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
#> asset:artifact/1430.shield_of_fate/trigger/2.check_condition
#
# 装備を付けた時のメイン処理
#
# @within function asset:artifact/1430.shield_of_fate/trigger/1.trigger
# ID指定する
data modify storage asset:artifact TargetID set value 1430
# 神器の基本的な条件の確認を行うfunction、成功している場合CanUsedタグが付く
function asset:artifact/common/check_condition/hotbar
# 他にアイテム等確認する場合はここに書く
execute if entity @s[tag=13Q.Equipped] run tag @s remove CanUsed
# CanUsedタグをチェックして3.main.mcfunctionを実行する
execute if entity @s[tag=CanUsed] run function asset:artifact/1430.shield_of_fate/trigger/3.main
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
#> asset:artifact/1430.shield_of_fate/trigger/3.main
#
# 装備時の具体的な処理
#
# @within function asset:artifact/1430.shield_of_fate/trigger/2.check_condition

# 基本的な使用時の処理(MP消費や使用回数の処理など)を行う
function asset:artifact/common/use/hotbar

# 装備タグの付与
tag @s add 13Q.Equipped

# 現在体力割合を取得する
function api:entity/player/get_health_per
execute store result score $13Q.HealthPer Temporary run data get storage api: Return.HealthPer 1000

# 現在体力が30%以下でデバフを、30%より上でバフを付与する
execute if score $13Q.HealthPer Temporary matches ..300 run function asset:artifact/1430.shield_of_fate/effect/debuff_give
execute unless score $13Q.HealthPer Temporary matches ..300 run function asset:artifact/1430.shield_of_fate/effect/buff_give

# リセット
scoreboard players reset $13Q.HealthPer Temporary

# sound
playsound minecraft:block.copper_trapdoor.open player @a ~ ~ ~ 1.0 0.5 0.0

playsound disabled_sounds:item.armor.equip_iron player @a ~ ~ ~ 1 1
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
#> asset:artifact/1430.shield_of_fate/trigger/_index.d
# @private

#> tag
# @within function asset:artifact/1430.shield_of_fate/trigger/**
#declare tag 13Q.Equipped

#> score
# @within function asset:artifact/1430.shield_of_fate/tick/**
#declare score_holder $13Q.HealthPer
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
#> asset:artifact/1430.shield_of_fate/trigger/dis_equip/
#
# 装備を外した時に外した部位にのみのidが入った状態でトリガーされる
#
# @within tag/function asset:artifact/dis_equip

execute if data storage asset:context id{hotbar:[1430]} run function asset:artifact/1430.shield_of_fate/trigger/dis_equip/main
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
#> asset:artifact/1430.shield_of_fate/trigger/dis_equip/main
#
# 装備を外した時のメイン処理
#
# @within function asset:artifact/1430.shield_of_fate/trigger/dis_equip/

#> prv
# @private
#declare score_holder $13Q.ItemCount

# まだ持っているか確認
execute store result score $13Q.ItemCount Temporary if data storage asset:context New.Items.hotbar[{tag:{TSB:{ID:1430}}}]

# なければ削除
execute if score $13Q.ItemCount Temporary matches ..0 run function asset:artifact/1430.shield_of_fate/trigger/dis_equip/remove_modifier

# リセット
scoreboard players reset $13Q.ItemCount Temporary
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
#> asset:artifact/1430.shield_of_fate/trigger/dis_equip/remove_modifier
#
# 装備を外した時のメイン効果
#
# @within function asset:artifact/1430.shield_of_fate/trigger/dis_equip/main

# 装備タグを外す
tag @s remove 13Q.Equipped
# MP消費
data modify storage api: Argument.Fluctuation set value -120
data modify storage api: Argument.DisableLog set value true
function api:mp/fluctuation

# 削除 (IDから)
data modify storage api: Argument.ID set value 354
execute as @s run function api:entity/mob/effect/remove/from_id
data modify storage api: Argument.ID set value 355
execute as @s run function api:entity/mob/effect/remove/from_id

# sound
playsound minecraft:item.armor.equip_generic player @a ~ ~ ~ 1 0.8
playsound minecraft:block.copper_trapdoor.open player @a ~ ~ ~ 1.0 0.9 0.0
playsound minecraft:block.copper_door.open player @a ~ ~ ~ 1.0 0.5 0.0
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
#> asset:effect/0354.protecction_of_courage/_/end
#
# Effectの効果の終了時に実行されるfunction
#
# @within tag/function asset:effect/end

execute if data storage asset:context {id:354} run function asset:effect/0354.protecction_of_courage/end/
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
#> asset:effect/0354.protecction_of_courage/_/given
#
# Effectが付与された時に実行されるfunction
#
# @within tag/function asset:effect/given

execute if data storage asset:context {id:354} run function asset:effect/0354.protecction_of_courage/given/
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
#> asset:effect/0354.protecction_of_courage/_/register
#
#
#
# @within tag/function asset:effect/register

execute if data storage asset:context {id:354} run function asset:effect/0354.protecction_of_courage/register
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
#> asset:effect/0354.protecction_of_courage/_/remove
#
# Effectが神器や牛乳によって削除された時に実行されるfunction
#
# @within tag/function asset:effect/remove

execute if data storage asset:context {id:354} run function asset:effect/0354.protecction_of_courage/remove/
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#> asset:effect/0354.protecction_of_courage/_index.d
# @private

#> 0354.protecction_of_courage
# @within function asset:effect/0354.protecction_of_courage/**
#declare
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#> asset:effect/0354.protecction_of_courage/end/
#
# Effectの効果が切れた時の処理
#
# @within function asset:effect/0354.protecction_of_courage/_/end

# 補正の削除
function asset:effect/0354.protecction_of_courage/modifier/remove
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#> asset:effect/0354.protecction_of_courage/given/
#
# Effectが付与された時の処理
#
# @within function asset:effect/0354.protecction_of_courage/_/given

# 補正を追加
function asset:effect/0354.protecction_of_courage/modifier/add
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
#> asset:effect/0354.protecction_of_courage/modifier/add
#
# 効果の付与
#
# @within function asset:effect/0354.protecction_of_courage/given/

# 補正を付与する
data modify storage api: Argument.UUID set from storage asset:context this.UUID
data modify storage api: Argument.Amount set from storage asset:context this.Amount
data modify storage api: Argument.Operation set value "multiply_base"
function api:modifier/defense/base/add
Loading
Loading