diff --git a/Asset/data/asset/functions/artifact/0250.phoenix/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0250.phoenix/give/2.give.mcfunction index ab8bcff460..1eab7a91a1 100644 --- a/Asset/data/asset/functions/artifact/0250.phoenix/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0250.phoenix/give/2.give.mcfunction @@ -15,7 +15,7 @@ # 神器の名前 (TextComponentString) data modify storage asset:artifact Name set value '[{"text":"舞焔","color":"dark_red"},{"text":"-Phoenix-","color":"red"}]' # 神器の説明文 (TextComponentString[]) - data modify storage asset:artifact Lore set value ['[{"text":"Phoenix -フェニックス-"}]','[{"text":"不死鳥と呼ばれ、火から自ら蘇る"}]','[{"text":"輪廻の外にある神鳥とされる"}]'] + data modify storage asset:artifact Lore set value ['{"text":"天候が晴れの時、ダメージが増加する"}','{"text":"時間が昼の時、ダメージが増加する"}','[{"text":"Phoenix -フェニックス-","color":"gray"}]','[{"text":"不死鳥と呼ばれ、火から自ら蘇る","color":"gray"}]','[{"text":"輪廻の外にある神鳥とされる","color":"gray"}]'] # 消費アイテム ({Item: TextComponent, Count: int, Extra?: TextComponent}) (オプション) # data modify storage asset:artifact ConsumeItem.Item set value # data modify storage asset:artifact ConsumeItem.Count set value @@ -29,7 +29,7 @@ # 神器の発動条件 (TextComponentString) (オプション) data modify storage asset:artifact Condition set value '{"text":"最大まで引き絞る"}' # 攻撃に関する情報 -Damage量 (literal[]/literal) Wikiを参照 (オプション) - data modify storage asset:artifact AttackInfo.Damage set value [300,400] + data modify storage asset:artifact AttackInfo.Damage set value "300 / 350 / 400" # 攻撃に関する情報 -攻撃タイプ (string[]) Wikiを参照 (オプション) data modify storage asset:artifact AttackInfo.AttackType set value [Magic] # 攻撃に関する情報 -攻撃属性 (string[]) Wikiを参照 (オプション) diff --git a/Asset/data/asset/functions/object/1072.arrow_of_phoenix/pre_hit/.mcfunction b/Asset/data/asset/functions/object/1072.arrow_of_phoenix/pre_hit/.mcfunction index 846c4112a7..197f828cd2 100644 --- a/Asset/data/asset/functions/object/1072.arrow_of_phoenix/pre_hit/.mcfunction +++ b/Asset/data/asset/functions/object/1072.arrow_of_phoenix/pre_hit/.mcfunction @@ -15,8 +15,7 @@ execute unless predicate lib:is_day if predicate lib:weather/is_sunny run particle dust 1 0 0 1 ~ ~-.3 ~ 0.4 0.4 0.4 0 100 force @a execute if predicate lib:is_day if predicate lib:weather/is_sunny run particle dust 0.969 0 1 1 ~ ~0.3 ~ 0.4 0.4 0.4 0 100 force @a # SE - playsound item.firecharge.use player @a[distance=..100] ~ ~ ~ 10 1 - playsound item.firecharge.use player @a[distance=..100] ~ ~ ~ 10 1 + playsound item.firecharge.use player @a[distance=..32] ~ ~ ~ 10 1 0.5 # 燃やす data modify entity @e[type=#lib:living_without_player,tag=1009.Target,distance=..0.1,limit=1] Fire set value 200s diff --git a/Asset/data/asset/functions/object/1072.arrow_of_phoenix/recursive/.mcfunction b/Asset/data/asset/functions/object/1072.arrow_of_phoenix/recursive/.mcfunction new file mode 100644 index 0000000000..c370d403e5 --- /dev/null +++ b/Asset/data/asset/functions/object/1072.arrow_of_phoenix/recursive/.mcfunction @@ -0,0 +1,13 @@ +#> asset:object/1072.arrow_of_phoenix/recursive/ +# +# 継承先などから実行される処理 +# +# @within asset:object/alias/1072/recursive + +# 演出 + particle dust_color_transition 1 0 0 0.7 1 0.533 0 ^ ^ ^ 0 0 0 0 1 normal @a + particle dust_color_transition 1 0 0 0.7 1 0.533 0 ^ ^ ^-0.25 0 0 0 0 1 normal @a + +# + execute if predicate lib:random_pass_per/25 run particle small_flame ^ ^ ^ 0.05 0.05 0.05 0 1 normal @a + execute if predicate lib:random_pass_per/25 run particle small_flame ^ ^ ^-0.25 0.05 0.05 0.05 0 1 normal @a diff --git a/Asset/data/asset/functions/object/alias/1072/recursive.mcfunction b/Asset/data/asset/functions/object/alias/1072/recursive.mcfunction new file mode 100644 index 0000000000..74fe70f26c --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1072/recursive.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1072/recursive +# +# メソッド処理のエイリアス +# +# @within asset_manager:object/call_method/run_method.m + +# 元のメソッド処理を呼び出す + function asset:object/1072.arrow_of_phoenix/recursive/ \ No newline at end of file