diff --git a/Asset/data/asset/functions/artifact/1495.wet_towel/give/1.trigger.mcfunction b/Asset/data/asset/functions/artifact/1495.wet_towel/give/1.trigger.mcfunction new file mode 100644 index 0000000000..308d77ee3c --- /dev/null +++ b/Asset/data/asset/functions/artifact/1495.wet_towel/give/1.trigger.mcfunction @@ -0,0 +1,7 @@ +#> asset:artifact/1495.wet_towel/give/1.trigger +# +# 神器の取得処理の呼び出し時に実行されるfunction +# +# @within tag/function asset:artifact/give + +execute if data storage asset:context {id:1495} run function asset:artifact/1495.wet_towel/give/2.give \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/1495.wet_towel/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1495.wet_towel/give/2.give.mcfunction new file mode 100644 index 0000000000..29c6f61edf --- /dev/null +++ b/Asset/data/asset/functions/artifact/1495.wet_towel/give/2.give.mcfunction @@ -0,0 +1,73 @@ +#> asset:artifact/1495.wet_towel/give/2.give +# +# 神器の作成部 ここでID等を定義する +# +# @user +# @within function asset:artifact/1495.wet_towel/give/1.trigger + +# 神器の説明や消費MPなどをここで設定する。 +# 最後にasset:artifact/common/giveを実行することで入手可能。 + +# 神器のID (int) スプレッドシートの値を入れる + data modify storage asset:artifact ID set value 1495 +# 神器のベースアイテム + data modify storage asset:artifact Item set value "minecraft:stick" +# 神器の名前 (TextComponentString) + data modify storage asset:artifact Name set value '{"text":"べちょべちょタオル","color":"#3E53FF"}' +# 神器の説明文 (TextComponentString[]) + data modify storage asset:artifact Lore set value ['[{"text":"装備すると火耐性が15%上昇する"}]','[{"text":"火属性攻撃を25回受けるとふかふかタオルに変化する"}]','[{"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 25 +# 神器を発動できるスロット (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 0 +# MP必要量 (int) (オプション) + # data modify storage asset:artifact MPRequire set value +# 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 +# 扱える神 (string[]) Wikiを参照 + data modify storage asset:artifact CanUsedGod set value "ALL" +# カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) + # data modify storage asset:artifact CustomNBT set value {} + +# 神器の入手用function + function asset:artifact/common/give diff --git a/Asset/data/asset/functions/artifact/1495.wet_towel/trigger/0.load.mcfunction b/Asset/data/asset/functions/artifact/1495.wet_towel/trigger/0.load.mcfunction new file mode 100644 index 0000000000..e0af8a7f63 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1495.wet_towel/trigger/0.load.mcfunction @@ -0,0 +1,9 @@ +#> asset:artifact/1495.wet_towel/trigger/0.load +# +# 神器に利用するスコアボード等の初期化処理 +# +# @within tag/function asset:artifact/load + +#> 定義類はここに +# @within function asset:artifact/1495.wet_towel/trigger/** + scoreboard objectives add \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/1495.wet_towel/trigger/1.trigger.mcfunction b/Asset/data/asset/functions/artifact/1495.wet_towel/trigger/1.trigger.mcfunction new file mode 100644 index 0000000000..2cacf9ffd4 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1495.wet_towel/trigger/1.trigger.mcfunction @@ -0,0 +1,8 @@ +#> asset:artifact/1495.wet_towel/trigger/1.trigger +# +# 指定したイベントタイミングで実行されるfunction +# +# @within tag/function asset:artifact/** + +# storage asset:idの%slot%に装備している神器のIDが入っているので比較し、~/2.check_condition.mcfunctionを実行する + execute if data storage asset:context id{hotbar:[1495]} run function asset:artifact/1495.wet_towel/trigger/2.check_condition \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/1495.wet_towel/trigger/2.check_condition.mcfunction b/Asset/data/asset/functions/artifact/1495.wet_towel/trigger/2.check_condition.mcfunction new file mode 100644 index 0000000000..913df5b098 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1495.wet_towel/trigger/2.check_condition.mcfunction @@ -0,0 +1,15 @@ +#> asset:artifact/1495.wet_towel/trigger/2.check_condition +# +# 神器の発動条件をチェックします +# +# @within function asset:artifact/1495.wet_towel/trigger/1.trigger + +# ID指定する + data modify storage asset:artifact TargetID set value 1495 +# 神器の基本的な条件の確認を行うfunction、成功している場合CanUsedタグが付く + function asset:artifact/common/check_condition/hotbar +# 他にアイテム等確認する場合はここに書く + execute if entity @s[tag=CanUsed] unless data storage asset:context Damage{ElementType:Fire} run tag @s remove CanUsed + +# CanUsedタグをチェックして3.main.mcfunctionを実行する + execute if entity @s[tag=CanUsed] run function asset:artifact/1495.wet_towel/trigger/3.main diff --git a/Asset/data/asset/functions/artifact/1495.wet_towel/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/1495.wet_towel/trigger/3.main.mcfunction new file mode 100644 index 0000000000..5f66877b2b --- /dev/null +++ b/Asset/data/asset/functions/artifact/1495.wet_towel/trigger/3.main.mcfunction @@ -0,0 +1,11 @@ +#> asset:artifact/1495.wet_towel/trigger/3.main +# +# 神器のメイン処理部 +# +# @within function asset:artifact/1495.wet_towel/trigger/2.check_condition + +# 基本的な使用時の処理(MP消費や使用回数の処理など)を行う + function asset:artifact/common/use/hotbar + +# ここから先は神器側の効果の処理を書く + say test: 1495.wet_towel \ No newline at end of file diff --git a/Asset/data/asset/tags/functions/artifact/damage/from_entity/.json b/Asset/data/asset/tags/functions/artifact/damage/from_entity/.json index ba88a05bc5..731a2205b8 100644 --- a/Asset/data/asset/tags/functions/artifact/damage/from_entity/.json +++ b/Asset/data/asset/tags/functions/artifact/damage/from_entity/.json @@ -1,5 +1,6 @@ { "values": [ + "asset:artifact/1495.wet_towel/trigger/1.trigger", "asset:artifact/1311.yearning_rose/damage_from_entity/1.trigger", "asset:artifact/0554.catastrophe/damage_entity/1.trigger", "asset:artifact/1141.bell_of_courage/trigger/1.trigger", @@ -16,4 +17,4 @@ "asset:artifact/0646.thorn_helm/damage_entity/1.trigger", "asset:artifact/0731.mouse_feet/trigger/1.trigger" ] -} +} \ No newline at end of file diff --git a/Asset/data/asset/tags/functions/artifact/give.json b/Asset/data/asset/tags/functions/artifact/give.json index fdb7a26c47..fb2555ccf1 100644 --- a/Asset/data/asset/tags/functions/artifact/give.json +++ b/Asset/data/asset/tags/functions/artifact/give.json @@ -1,5 +1,6 @@ { "values": [ + "asset:artifact/1495.wet_towel/give/1.trigger", "asset:artifact/1562.tsukimi_dango/give/1.trigger", "asset:artifact/1430.shield_of_fate/give/1.trigger", "asset:artifact/1453.frost_flake_bow/give/1.trigger", @@ -540,4 +541,4 @@ "asset:artifact/0735.collision_plate/give/1.trigger", "asset:artifact/0745.blade_of_whirlwind/give/1.trigger" ] -} +} \ No newline at end of file diff --git a/Asset/data/asset/tags/functions/artifact/load.json b/Asset/data/asset/tags/functions/artifact/load.json index d2ddb423a8..d85c328ce0 100644 --- a/Asset/data/asset/tags/functions/artifact/load.json +++ b/Asset/data/asset/tags/functions/artifact/load.json @@ -1,5 +1,6 @@ { "values": [ + "asset:artifact/1495.wet_towel/trigger/0.load", "asset:artifact/1453.frost_flake_bow/trigger/0.load", "asset:artifact/1332.bebebeam/trigger/0.load", "asset:artifact/1252.fox_candle/trigger/0.load",