diff --git a/Asset/data/asset/functions/artifact/1363.hydra_fang/give/1.trigger.mcfunction b/Asset/data/asset/functions/artifact/1363.hydra_fang/give/1.trigger.mcfunction new file mode 100644 index 0000000000..3d1aaef188 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1363.hydra_fang/give/1.trigger.mcfunction @@ -0,0 +1,7 @@ +#> asset:artifact/1363.hydra_fang/give/1.trigger +# +# 神器の取得処理の呼び出し時に実行されるfunction +# +# @within tag/function asset:artifact/give + +execute if data storage asset:context {id:1363} run function asset:artifact/1363.hydra_fang/give/2.give \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/1363.hydra_fang/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1363.hydra_fang/give/2.give.mcfunction new file mode 100644 index 0000000000..fe01aa7456 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1363.hydra_fang/give/2.give.mcfunction @@ -0,0 +1,73 @@ +#> asset:artifact/1363.hydra_fang/give/2.give +# +# 神器の作成部 ここでID等を定義する +# +# @user +# @within function asset:artifact/1363.hydra_fang/give/1.trigger + +# 神器の説明や消費MPなどをここで設定する。 +# 最後にasset:artifact/common/giveを実行することで入手可能。 + +# 神器のID (int) スプレッドシートの値を入れる + data modify storage asset:artifact ID set value 1363 +# 神器のベースアイテム + data modify storage asset:artifact Item set value "minecraft:stick" +# 神器の名前 (TextComponentString) + data modify storage asset:artifact Name set value '{"text":"ヒドラの毒牙","color":"#0e8012"}' +# 神器の説明文 (TextComponentString[]) + data modify storage asset:artifact Lore set value ['{"text":"体力を最大体力の2%分回復する","color":"white"}','{"text":"猛毒が滴る魔獣の牙","color":"gray"}','{"text":"毒の雫が命を奪い、主を潤す","color":"gray"}'] +# 消費アイテム ({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 "onAttack" +# 効果が重複可能か否か (boolean) (オプション) + # data modify storage asset:artifact EnableDuplication set value +# 神器の発動条件 (TextComponentString) (オプション) + data modify storage asset:artifact Condition set value '{"text":"継続ダメージで攻撃時に20%の確率で発動","color":"white"}' +# 攻撃に関する情報 -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 5 +# 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 40 +# 種別クールダウン ({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 true +# MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション) + data modify storage asset:artifact DisableMPMessage set value true +# 破壊時の音を鳴らさないかどうか (boolean) (オプション) + # data modify storage asset:artifact DisableBreakSound set value +# 扱える神 (string[]) Wikiを参照 + data modify storage asset:artifact CanUsedGod set value ["Urban", "Wi-ki", "Rumor"] +# カスタム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/1363.hydra_fang/register.mcfunction b/Asset/data/asset/functions/artifact/1363.hydra_fang/register.mcfunction new file mode 100644 index 0000000000..de93dfafc9 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1363.hydra_fang/register.mcfunction @@ -0,0 +1,7 @@ +#> asset:artifact/1363.hydra_fang/register +# +# 神器プールへの登録処理 +# +# @within tag/function asset:artifact/register + +data modify storage asset:artifact RarityRegistry[2] append value [1363] \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/1363.hydra_fang/trigger/1.trigger.mcfunction b/Asset/data/asset/functions/artifact/1363.hydra_fang/trigger/1.trigger.mcfunction new file mode 100644 index 0000000000..77f0253a3b --- /dev/null +++ b/Asset/data/asset/functions/artifact/1363.hydra_fang/trigger/1.trigger.mcfunction @@ -0,0 +1,8 @@ +#> asset:artifact/1363.hydra_fang/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:[1363]} run function asset:artifact/1363.hydra_fang/trigger/2.check_condition \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/1363.hydra_fang/trigger/2.check_condition.mcfunction b/Asset/data/asset/functions/artifact/1363.hydra_fang/trigger/2.check_condition.mcfunction new file mode 100644 index 0000000000..27929bbe41 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1363.hydra_fang/trigger/2.check_condition.mcfunction @@ -0,0 +1,25 @@ +#> asset:artifact/1363.hydra_fang/trigger/2.check_condition +# +# 神器の発動条件をチェックします +# +# @within function asset:artifact/1363.hydra_fang/trigger/1.trigger + +# ID指定する + data modify storage asset:artifact TargetID set value 1363 +# 神器の基本的な条件の確認を行うfunction、成功している場合CanUsedタグが付く + function asset:artifact/common/check_condition/hotbar +# 他にアイテム等確認する場合はここに書く + +# IsDoT:trueでないならCanUsedを削除 + execute if entity @s[tag=CanUsed] unless data storage asset:context Attack{IsDoT:true} run tag @s remove CanUsed + +# Attack.Toの回数だけ確率の判定を行う +# 実装現在、DoTで範囲ダメージの神器は存在しないが、今後実装される可能性も0ではないので念のためこうする + execute if entity @s[tag=CanUsed] store result score $AttackCount Temporary if data storage asset:context Attack.To[] + execute if entity @s[tag=CanUsed] run function asset:artifact/1363.hydra_fang/trigger/2.check_condition/check_recursive + +# CanUsedタグをチェックして3.main.mcfunctionを実行する + execute if entity @s[tag=CanUsed] run function asset:artifact/1363.hydra_fang/trigger/3.main + +# リセット + scoreboard players reset $AttackCount Temporary diff --git a/Asset/data/asset/functions/artifact/1363.hydra_fang/trigger/2.check_condition/check_recursive.mcfunction b/Asset/data/asset/functions/artifact/1363.hydra_fang/trigger/2.check_condition/check_recursive.mcfunction new file mode 100644 index 0000000000..bba13d70d0 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1363.hydra_fang/trigger/2.check_condition/check_recursive.mcfunction @@ -0,0 +1,19 @@ +#> asset:artifact/1363.hydra_fang/trigger/2.check_condition/check_recursive +# +# +# +# @within function +# asset:artifact/1363.hydra_fang/trigger/2.check_condition +# asset:artifact/1363.hydra_fang/trigger/2.check_condition/check_recursive + +# 再帰回数のデクリメント + scoreboard players remove $AttackCount Temporary 1 + +# N%を引いたらreturn + execute if predicate lib:random_pass_per/20 run return fail + +# まだ$AttackCountが残っているなら再帰 + execute if score $AttackCount Temporary matches 0.. run function asset:artifact/1363.hydra_fang/trigger/2.check_condition/check_recursive + +# AttackCountが0未満ならCanUsedを削除 + execute unless score $AttackCount Temporary matches 0.. run tag @s remove CanUsed diff --git a/Asset/data/asset/functions/artifact/1363.hydra_fang/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/1363.hydra_fang/trigger/3.main.mcfunction new file mode 100644 index 0000000000..3b02131a62 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1363.hydra_fang/trigger/3.main.mcfunction @@ -0,0 +1,21 @@ +#> asset:artifact/1363.hydra_fang/trigger/3.main +# +# 神器のメイン処理部 +# +# @within function asset:artifact/1363.hydra_fang/trigger/2.check_condition + +# 基本的な使用時の処理(MP消費や使用回数の処理など)を行う + function asset:artifact/common/use/hotbar + +# ここから先は神器側の効果の処理を書く + +# 演出 + particle dust 0 0.5 0 0.75 ~ ~1.2 ~ 0.4 0.4 0.4 0 20 + execute if predicate lib:random_pass_per/40 run playsound entity.spider.step player @a ~ ~ ~ 0.4 2 + +# 回復 + function api:modifier/max_health/get + execute store result storage api: Argument.Heal double 0.02 run data get storage api: Return.MaxHealth 1 + function api:heal/modifier + function api:heal/ + function api:heal/reset diff --git a/Asset/data/asset/functions/artifact/1363.hydra_fang/trigger/_index.d.mcfunction b/Asset/data/asset/functions/artifact/1363.hydra_fang/trigger/_index.d.mcfunction new file mode 100644 index 0000000000..5ff9167837 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1363.hydra_fang/trigger/_index.d.mcfunction @@ -0,0 +1,6 @@ +#> asset:artifact/1363.hydra_fang/trigger/_index.d +# @private + +#> tag +# @within function asset:artifact/1363.hydra_fang/trigger/** + #declare score_holder $AttackCount diff --git a/Asset/data/asset/tags/functions/artifact/attack.json b/Asset/data/asset/tags/functions/artifact/attack.json index 2758c71743..b454749aaf 100644 --- a/Asset/data/asset/tags/functions/artifact/attack.json +++ b/Asset/data/asset/tags/functions/artifact/attack.json @@ -1,5 +1,6 @@ { "values": [ + "asset:artifact/1363.hydra_fang/trigger/1.trigger", "asset:artifact/0897.lightning_broach/trigger/1.trigger", "asset:artifact/0554.catastrophe/attack/1.trigger", "asset:artifact/1110.lantern_of_firefly/trigger/1.trigger", @@ -8,4 +9,4 @@ "asset:artifact/0664.soul_fire_armor/attack/1.trigger", "asset:artifact/0724.oblivious_snow/attack/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 f3eb008857..0c716df443 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/1363.hydra_fang/give/1.trigger", "asset:artifact/1140.over_pulse_booster/give/1.trigger", "asset:artifact/1139.over_pulse_legframe/give/1.trigger", "asset:artifact/1138.over_pulse_bodyarmor/give/1.trigger", @@ -517,4 +518,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/register.json b/Asset/data/asset/tags/functions/artifact/register.json index deba166150..82474bafc6 100644 --- a/Asset/data/asset/tags/functions/artifact/register.json +++ b/Asset/data/asset/tags/functions/artifact/register.json @@ -1,5 +1,6 @@ { "values": [ + "asset:artifact/1363.hydra_fang/register", "asset:artifact/1137.over_pulse_headgear/register", "asset:artifact/1228.fatalerror/register", "asset:artifact/1273.maidchan_plush/register", @@ -295,4 +296,4 @@ "asset:artifact/1027.fire_of_rebirth/register", "asset:artifact/1111.rod_o_redeem/register" ] -} +} \ No newline at end of file