diff --git a/Asset/data/asset/functions/artifact/0249.wakinyan/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0249.wakinyan/give/2.give.mcfunction index 540474f408..32aeb290e8 100644 --- a/Asset/data/asset/functions/artifact/0249.wakinyan/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0249.wakinyan/give/2.give.mcfunction @@ -15,7 +15,7 @@ # 神器の名前 (TextComponentString) data modify storage asset:artifact Name set value '[{"text":"雷翔","color":"yellow"},{"text":"-Wakinyan-","color":"gold"}]' # 神器の説明文 (TextComponentString[]) - data modify storage asset:artifact Lore set value ['[{"text":"Wakinyan -ワキンヤン-"}]','[{"text":"インディアンの間に古来より伝わる神鳥である"}]','[{"text":"雷の精霊の力で自在に雷を放つと云われる"}]'] + data modify storage asset:artifact Lore set value ['{"text":"天候が雨の時、ダメージが増加する"}','{"text":"天候が雷雨の時、ダメージが更に増加する"}','[{"text":"Wakinyan -ワキンヤン-","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 [250,330] + data modify storage asset:artifact AttackInfo.Damage set value "250 / 290 / 330" # 攻撃に関する情報 -攻撃タイプ (string[]) Wikiを参照 (オプション) data modify storage asset:artifact AttackInfo.AttackType set value [Magic] # 攻撃に関する情報 -攻撃属性 (string[]) Wikiを参照 (オプション) diff --git a/Asset/data/asset/functions/object/1071.arrow_of_wakinyan/pre_hit/.mcfunction b/Asset/data/asset/functions/object/1071.arrow_of_wakinyan/pre_hit/.mcfunction index 91d7a1458c..9516656e29 100644 --- a/Asset/data/asset/functions/object/1071.arrow_of_wakinyan/pre_hit/.mcfunction +++ b/Asset/data/asset/functions/object/1071.arrow_of_wakinyan/pre_hit/.mcfunction @@ -10,8 +10,8 @@ execute if predicate lib:weather/is_raining run particle dust 1 0.6 0 1 ~ ~4 ~ 0.01 4.5 0.01 0 100 force @a execute if predicate lib:weather/is_thundering run particle dust 1 0 0 1 ~ ~4 ~ 0.01 4.5 0.01 0 100 force @a # SE - playsound entity.lightning_bolt.thunder player @a[distance=..100] ~ ~ ~ 10 2 - playsound entity.lightning_bolt.thunder player @a[distance=..100] ~ ~ ~ 10 2 + playsound entity.lightning_bolt.thunder player @a[distance=..32] ~ ~ ~ 10 2 0.5 + #playsound entity.lightning_bolt.thunder player @a[distance=..32] ~ ~ ~ 10 2 0.5 # ダメージ execute if predicate lib:weather/is_sunny run data modify storage asset:context this.Damage set from storage asset:context this.DamageForSunny diff --git a/Asset/data/asset/functions/object/1071.arrow_of_wakinyan/recursive/.mcfunction b/Asset/data/asset/functions/object/1071.arrow_of_wakinyan/recursive/.mcfunction new file mode 100644 index 0000000000..f3e5b7131c --- /dev/null +++ b/Asset/data/asset/functions/object/1071.arrow_of_wakinyan/recursive/.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/1071.arrow_of_wakinyan/recursive/ +# +# 継承先などから実行される処理 +# +# @within asset:object/alias/1071/recursive + + particle dust 1 1 0 0.7 ^ ^ ^ 0 0 0 0 1 normal @a + particle dust 1 1 0 0.7 ^ ^ ^-0.25 0 0 0 0 1 normal @a diff --git a/Asset/data/asset/functions/object/alias/1071/recursive.mcfunction b/Asset/data/asset/functions/object/alias/1071/recursive.mcfunction new file mode 100644 index 0000000000..4b0b0016dc --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1071/recursive.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1071/recursive +# +# メソッド処理のエイリアス +# +# @within asset_manager:object/call_method/run_method.m + +# 元のメソッド処理を呼び出す + function asset:object/1071.arrow_of_wakinyan/recursive/ \ No newline at end of file