diff --git a/.vscode/settings.json b/.vscode/settings.json index e7841aee58..b08a9d1803 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -662,6 +662,10 @@ " # data modify storage asset:artifact DisableMPMessage set value ", "# 破壊時の音を鳴らさないかどうか (boolean) (オプション)", " # data modify storage asset:artifact DisableBreakSound set value", + "# セット装備のID (int) (オプション)", + " # data modify storage asset:artifact EquipID set value", + "# 装備時のステータス補正 (Component[]) (オプション)", + " # data modify storage asset:artifact Modifiers set value [{}]", "# 扱える神 (string[]) Wikiを参照", " data modify storage asset:artifact CanUsedGod set value []", "# カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション)", diff --git a/Asset/data/asset/functions/artifact/0073.suzuran_charm/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0073.suzuran_charm/give/2.give.mcfunction index 8df329d51f..4a0cafb4d0 100644 --- a/Asset/data/asset/functions/artifact/0073.suzuran_charm/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0073.suzuran_charm/give/2.give.mcfunction @@ -53,7 +53,7 @@ # 扱える神 (string[]) Wikiを参照 data modify storage asset:artifact CanUsedGod set value ["Flora", "Urban", "Nyaptov", "Rumor"] # カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) - data modify storage asset:artifact CustomNBT set value {HideFlags:6,AttributeModifiers:[{AttributeName:"generic.attack_damage",Name:"generic.attack_damage",Amount:0,Operation:0,UUID:[I;1,1,73,1],Slot:"mainhand"},{AttributeName:"generic.attack_speed",Name:"generic.attack_speed",Amount:100,Operation:0,UUID:[I;1,1,73,1]}]} + data modify storage asset:artifact CustomNBT set value {HideFlags:6,AttributeModifiers:[]} # 神器の入手用function - function asset:artifact/common/give \ No newline at end of file + function asset:artifact/common/give diff --git a/Asset/data/asset/functions/artifact/0166.blessing_armor/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0166.blessing_armor/give/2.give.mcfunction index aa52fa82c9..045e568a64 100644 --- a/Asset/data/asset/functions/artifact/0166.blessing_armor/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0166.blessing_armor/give/2.give.mcfunction @@ -50,10 +50,12 @@ # data modify storage asset:artifact DisableCooldownMessage set value # MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション) # data modify storage asset:artifact DisableMPMessage set value +# 装備時のステータス補正 (Component[]) (オプション) + data modify storage asset:artifact Modifiers set value [{Type:"maxHealth",Slot:"chest",Amount:0.20d,Operation:"multiply_base"}] # 扱える神 (string[]) Wikiを参照 data modify storage asset:artifact CanUsedGod set value ["Flora", "Urban", "Nyaptov", "Wi-ki", "Rumor"] # カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) - data modify storage asset:artifact CustomNBT set value {AttributeModifiers:[{AttributeName:"generic.max_health",Name:"generic.max_health",Amount:0.2,Operation:1,UUID:[I;1,1,166,4],Slot:"chest"},{AttributeName:"generic.armor",Name:"generic.armor",Amount:-1,Operation:1,UUID:[I;1,1,166,4],Slot:"chest"}]} + data modify storage asset:artifact CustomNBT set value {AttributeModifiers:[{AttributeName:"generic.armor",Name:"generic.armor",Amount:-1,Operation:1,UUID:[I;1,1,166,4],Slot:"chest"}]} # 神器の入手用function - function asset:artifact/common/give \ No newline at end of file + function asset:artifact/common/give diff --git a/Asset/data/asset/functions/artifact/0207.life_is_transitory/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0207.life_is_transitory/give/2.give.mcfunction index 7f9148f9d4..7fc48fa90d 100644 --- a/Asset/data/asset/functions/artifact/0207.life_is_transitory/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0207.life_is_transitory/give/2.give.mcfunction @@ -50,10 +50,12 @@ # data modify storage asset:artifact DisableCooldownMessage set value # MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション) # data modify storage asset:artifact DisableMPMessage set value +# 装備時のステータス補正 (Component[]) (オプション) + data modify storage asset:artifact Modifiers set value [{Type:"maxHealth",Slot:"offhand",Amount:-0.99d,Operation:"multiply"}] # 扱える神 (string[]) Wikiを参照 data modify storage asset:artifact CanUsedGod set value ["Flora", "Wi-ki"] # カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) - data modify storage asset:artifact CustomNBT set value {AttributeModifiers:[{AttributeName:"generic.max_health",Name:"generic.max_health",Amount:-0.99,Operation:2,UUID:[I;1,1,207,2],Slot:"offhand"}]} + # data modify storage asset:artifact CustomNBT set value {} # 神器の入手用function - function asset:artifact/common/give \ No newline at end of file + function asset:artifact/common/give diff --git a/Asset/data/asset/functions/artifact/0246.magical_cane/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0246.magical_cane/give/2.give.mcfunction index 908d741b7e..acd12b6617 100644 --- a/Asset/data/asset/functions/artifact/0246.magical_cane/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0246.magical_cane/give/2.give.mcfunction @@ -53,7 +53,7 @@ # 扱える神 (string[]) Wikiを参照 data modify storage asset:artifact CanUsedGod set value ["Flora", "Nyaptov", "Rumor"] # カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) - data modify storage asset:artifact CustomNBT set value {HideFlags:6,AttributeModifiers:[{AttributeName:"generic.attack_damage",Name:"generic.attack_damage",Amount:0,Operation:0,UUID:[I;1325912063,-1346287147,-1646160005,-2144481414],Slot:"mainhand"},{AttributeName:"generic.attack_speed",Name:"generic.attack_speed",Amount:100,Operation:0,UUID:[I;108815412,1284391254,-1801712452,1121514494]}]} + data modify storage asset:artifact CustomNBT set value {HideFlags:6,AttributeModifiers:[]} # 神器の入手用function - function asset:artifact/common/give \ No newline at end of file + function asset:artifact/common/give diff --git a/Asset/data/asset/functions/artifact/0349.passion_pickaxe/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0349.passion_pickaxe/give/2.give.mcfunction index 53edbeb3f5..a4e583adc6 100644 --- a/Asset/data/asset/functions/artifact/0349.passion_pickaxe/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0349.passion_pickaxe/give/2.give.mcfunction @@ -53,7 +53,7 @@ # 扱える神 (string[]) Wikiを参照 data modify storage asset:artifact CanUsedGod set value ["Urban", "Nyaptov", "Rumor"] # カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) - data modify storage asset:artifact CustomNBT set value {HideFlags:63,Unbreakable:1b,AttributeModifiers:[{AttributeName:"generic.attack_damage",Name:"generic.attack_damage",Amount:0,Operation:0,UUID:[I;1,1,349,1],Slot:"mainhand"},{AttributeName:"generic.attack_speed",Name:"generic.attack_speed",Amount:100,Operation:0,UUID:[I;1,1,349,1],Slot:"mainhand"}]} + data modify storage asset:artifact CustomNBT set value {HideFlags:63,Unbreakable:1b,AttributeModifiers:[]} # 神器の入手用function - function asset:artifact/common/give \ No newline at end of file + function asset:artifact/common/give diff --git a/Asset/data/asset/functions/artifact/0382.haru_urara/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0382.haru_urara/give/2.give.mcfunction index 9f19eeba01..f7e5598dd8 100644 --- a/Asset/data/asset/functions/artifact/0382.haru_urara/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0382.haru_urara/give/2.give.mcfunction @@ -53,7 +53,7 @@ # 扱える神 (string[]) Wikiを参照 data modify storage asset:artifact CanUsedGod set value ["Flora", "Urban", "Nyaptov", "Rumor"] # カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) - data modify storage asset:artifact CustomNBT set value {HideFlags:63,Unbreakable:1b,AttributeModifiers:[{AttributeName:"generic.attack_damage",Name:"generic.attack_damage",Amount:0,Operation:0,UUID:[I;1,1,382,1],Slot:"mainhand"},{AttributeName:"generic.attack_speed",Name:"generic.attack_speed",Amount:100,Operation:0,UUID:[I;1,1,382,1],Slot:"mainhand"}]} + data modify storage asset:artifact CustomNBT set value {HideFlags:63,Unbreakable:1b,AttributeModifiers:[]} # 神器の入手用function - function asset:artifact/common/give \ No newline at end of file + function asset:artifact/common/give diff --git a/Asset/data/asset/functions/artifact/0534.all_night_hellmet/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0534.all_night_hellmet/give/2.give.mcfunction index dca8287fa1..87be67bcbd 100644 --- a/Asset/data/asset/functions/artifact/0534.all_night_hellmet/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0534.all_night_hellmet/give/2.give.mcfunction @@ -25,7 +25,7 @@ # 神器のトリガー (string) Wikiを参照 data modify storage asset:artifact Trigger set value "onAttackByMelee" # 神器の発動条件 (TextComponentString) (オプション) - data modify storage asset:artifact Condition set value '{"text":"夜の間、終夜をすべて着ている状態"}' + # data modify storage asset:artifact Condition set value # 攻撃に関する情報 -Damage量 (literal[]/literal) Wikiを参照 (オプション) data modify storage asset:artifact AttackInfo.Damage set value [15] # 攻撃に関する情報 -攻撃タイプ (string[]) Wikiを参照 (オプション) @@ -50,10 +50,12 @@ # data modify storage asset:artifact DisableCooldownMessage set value # MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション) # data modify storage asset:artifact DisableMPMessage set value +# セット装備のID (int) (オプション) + data modify storage asset:artifact EquipID set value 241 # 扱える神 (string[]) Wikiを参照 data modify storage asset:artifact CanUsedGod set value ["Flora", "Urban", "Nyaptov", "Wi-ki", "Rumor"] # カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) - data modify storage asset:artifact CustomNBT set value {Unbreakable:1b,display:{color:1050959},HideFlags:64,Enchantments:[{id:"minecraft:protection",lvl:2s},{id:"minecraft:projectile_protection",lvl:3s}],AttributeModifiers:[{AttributeName:"generic.armor",Name:"generic.armor",Amount:1,Operation:0,UUID:[I;1,1,534,6],Slot:"head"}]} + data modify storage asset:artifact CustomNBT set value {HideFlags:196,Unbreakable:1b,display:{color:1050959},Trim:{material:"gold",pattern:"tsb_armor:534"},Enchantments:[{id:"minecraft:protection",lvl:2s},{id:"minecraft:projectile_protection",lvl:3s}],AttributeModifiers:[{AttributeName:"generic.armor",Name:"generic.armor",Amount:1,Operation:0,UUID:[I;1,1,534,6],Slot:"head"}]} # 神器の入手用function - function asset:artifact/common/give \ No newline at end of file + function asset:artifact/common/give diff --git a/Asset/data/asset/functions/artifact/0535.all_night_chestplate/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0535.all_night_chestplate/give/2.give.mcfunction index f53969e080..95412a1ca8 100644 --- a/Asset/data/asset/functions/artifact/0535.all_night_chestplate/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0535.all_night_chestplate/give/2.give.mcfunction @@ -25,7 +25,7 @@ # 神器のトリガー (string) Wikiを参照 data modify storage asset:artifact Trigger set value "onAttackByMelee" # 神器の発動条件 (TextComponentString) (オプション) - data modify storage asset:artifact Condition set value '{"text":"夜の間、終夜をすべて着ている状態"}' + # data modify storage asset:artifact Condition set value # 攻撃に関する情報 -Damage量 (literal[]/literal) Wikiを参照 (オプション) data modify storage asset:artifact AttackInfo.Damage set value [15] # 攻撃に関する情報 -攻撃タイプ (string[]) Wikiを参照 (オプション) @@ -50,10 +50,12 @@ # data modify storage asset:artifact DisableCooldownMessage set value # MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション) # data modify storage asset:artifact DisableMPMessage set value +# セット装備のID (int) (オプション) + data modify storage asset:artifact EquipID set value 241 # 扱える神 (string[]) Wikiを参照 data modify storage asset:artifact CanUsedGod set value ["Flora", "Urban", "Nyaptov", "Wi-ki", "Rumor"] # カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) - data modify storage asset:artifact CustomNBT set value {Unbreakable:1b,display:{color:1050959},HideFlags:64,Enchantments:[{id:"minecraft:protection",lvl:5s}],AttributeModifiers:[{AttributeName:"generic.armor",Name:"generic.armor",Amount:3,Operation:0,UUID:[I;1,1,535,5],Slot:"chest"}]} + data modify storage asset:artifact CustomNBT set value {HideFlags:196,Unbreakable:1b,display:{color:1050959},Trim:{material:"gold",pattern:"tsb_armor:534"},Enchantments:[{id:"minecraft:protection",lvl:5s}],AttributeModifiers:[{AttributeName:"generic.armor",Name:"generic.armor",Amount:3,Operation:0,UUID:[I;1,1,535,5],Slot:"chest"}]} # 神器の入手用function - function asset:artifact/common/give \ No newline at end of file + function asset:artifact/common/give diff --git a/Asset/data/asset/functions/artifact/0535.all_night_chestplate/trigger/2.check_condition.mcfunction b/Asset/data/asset/functions/artifact/0535.all_night_chestplate/trigger/2.check_condition.mcfunction index d02928bb1e..c33c7b0337 100644 --- a/Asset/data/asset/functions/artifact/0535.all_night_chestplate/trigger/2.check_condition.mcfunction +++ b/Asset/data/asset/functions/artifact/0535.all_night_chestplate/trigger/2.check_condition.mcfunction @@ -10,21 +10,24 @@ function asset:artifact/common/check_condition/chest # 他にアイテム等確認する場合はここに書く +# 部位数チェック + data modify storage api: Argument.ID set value 241 + function api:entity/mob/effect/get/from_id # 今が夜かどうか確認 execute store result score $Daytime Temporary run time query daytime # 装備をすべて着ているが、夜じゃない場合 - execute if data storage asset:context {Inventory:[{Slot:103b,tag:{TSB:{ID:534}}},{Slot:101b,tag:{TSB:{ID:536}}},{Slot:100b,tag:{TSB:{ID:537}}}]} if score $Daytime Temporary matches 0..12000 run tag @s remove CanUsed + execute if data storage api: Return.Effect{Stack:4} if score $Daytime Temporary matches 0..12000 run tag @s remove CanUsed # 演出（使用できないときのメッセージだすとうるさいのでなし） execute unless entity @s[tag=CanUsed] run particle minecraft:smoke ~ ~1 ~ 0.3 0.3 0.3 0 20 normal @s execute unless entity @s[tag=CanUsed] run playsound minecraft:block.stone_button.click_off player @s ~ ~ ~ 1 2 # 装備が足りない場合 - execute unless data storage asset:context {Inventory:[{Slot:103b,tag:{TSB:{ID:534}}},{Slot:101b,tag:{TSB:{ID:536}}},{Slot:100b,tag:{TSB:{ID:537}}}]} run tag @s remove CanUsed + execute unless data storage api: Return.Effect{Stack:4} run tag @s remove CanUsed # リセット scoreboard players reset $Daytime Temporary # CanUsedタグをチェックして3.main.mcfunctionを実行する - execute if entity @s[tag=CanUsed] run function asset:artifact/0535.all_night_chestplate/trigger/3.main \ No newline at end of file + execute if entity @s[tag=CanUsed] run function asset:artifact/0535.all_night_chestplate/trigger/3.main diff --git a/Asset/data/asset/functions/artifact/0535.all_night_chestplate/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0535.all_night_chestplate/trigger/3.main.mcfunction index 4296821ca1..a84846bfb9 100644 --- a/Asset/data/asset/functions/artifact/0535.all_night_chestplate/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/0535.all_night_chestplate/trigger/3.main.mcfunction @@ -15,22 +15,22 @@ execute at @e[type=#lib:living,type=!player,tag=Victim,distance=..10] run particle minecraft:squid_ink ~ ~1 ~ 0.4 0.4 0.4 0.03 30 # ダメージ設定 - # 与えるダメージ = 90 - data modify storage lib: Argument.Damage set value 15.0f + # 与えるダメージ = 15 + data modify storage api: Argument.Damage set value 15.0f # 第一属性 - data modify storage lib: Argument.AttackType set value "Magic" + data modify storage api: Argument.AttackType set value "Magic" # ダメージ - function lib:damage/modifier - execute as @e[type=#lib:living,type=!player,tag=Victim,distance=..10] run function lib:damage/ + function api:damage/modifier + execute as @e[type=#lib:living,type=!player,tag=Victim,distance=..10] run function api:damage/ # リセット - function lib:damage/reset + function api:damage/reset # 引数の設定 # 回復する量 = 2 - data modify storage lib: Argument.Heal set value 2f + data modify storage api: Argument.Heal set value 2f # 補正function - function lib:heal/modifier + function api:heal/modifier # 自分を対象に - function lib:heal/ + function api:heal/ # リセット - function lib:heal/reset \ No newline at end of file + function api:heal/reset diff --git a/Asset/data/asset/functions/artifact/0536.all_night_leggings/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0536.all_night_leggings/give/2.give.mcfunction index 82495c1038..b5b4fc4f4f 100644 --- a/Asset/data/asset/functions/artifact/0536.all_night_leggings/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0536.all_night_leggings/give/2.give.mcfunction @@ -25,7 +25,7 @@ # 神器のトリガー (string) Wikiを参照 data modify storage asset:artifact Trigger set value "onAttackByMelee" # 神器の発動条件 (TextComponentString) (オプション) - data modify storage asset:artifact Condition set value '{"text":"夜の間、終夜をすべて着ている状態"}' + # data modify storage asset:artifact Condition set value # 攻撃に関する情報 -Damage量 (literal[]/literal) Wikiを参照 (オプション) data modify storage asset:artifact AttackInfo.Damage set value [15] # 攻撃に関する情報 -攻撃タイプ (string[]) Wikiを参照 (オプション) @@ -50,10 +50,12 @@ # data modify storage asset:artifact DisableCooldownMessage set value # MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション) # data modify storage asset:artifact DisableMPMessage set value +# セット装備のID (int) (オプション) + data modify storage asset:artifact EquipID set value 241 # 扱える神 (string[]) Wikiを参照 data modify storage asset:artifact CanUsedGod set value ["Flora", "Urban", "Nyaptov", "Wi-ki", "Rumor"] # カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) - data modify storage asset:artifact CustomNBT set value {Unbreakable:1b,display:{color:1050959},HideFlags:64,Enchantments:[{id:"minecraft:protection",lvl:1s}],AttributeModifiers:[{AttributeName:"generic.armor",Name:"generic.armor",Amount:3,Operation:0,UUID:[I;1,1,536,4],Slot:"legs"},{AttributeName:"generic.movement_speed",Name:"generic.movement_speed",Amount:0.2,Operation:1,UUID:[I;1,1,536,4],Slot:"legs"}]} + data modify storage asset:artifact CustomNBT set value {HideFlags:196,Unbreakable:1b,display:{color:1050959},Trim:{material:"netherite",pattern:"tsb_armor:534"},Enchantments:[{id:"minecraft:protection",lvl:1s}],AttributeModifiers:[{AttributeName:"generic.armor",Name:"generic.armor",Amount:3,Operation:0,UUID:[I;1,1,536,4],Slot:"legs"},{AttributeName:"generic.movement_speed",Name:"generic.movement_speed",Amount:0.2,Operation:1,UUID:[I;1,1,536,4],Slot:"legs"}]} # 神器の入手用function function asset:artifact/common/give diff --git a/Asset/data/asset/functions/artifact/0537.all_night_boots/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0537.all_night_boots/give/2.give.mcfunction index cab38e23aa..45b1fa9c69 100644 --- a/Asset/data/asset/functions/artifact/0537.all_night_boots/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0537.all_night_boots/give/2.give.mcfunction @@ -25,7 +25,7 @@ # 神器のトリガー (string) Wikiを参照 data modify storage asset:artifact Trigger set value "onAttackByMelee" # 神器の発動条件 (TextComponentString) (オプション) - data modify storage asset:artifact Condition set value '{"text":"夜の間、終夜をすべて着ている状態"}' + # data modify storage asset:artifact Condition set value # 攻撃に関する情報 -Damage量 (literal[]/literal) Wikiを参照 (オプション) data modify storage asset:artifact AttackInfo.Damage set value [15] # 攻撃に関する情報 -攻撃タイプ (string[]) Wikiを参照 (オプション) @@ -50,10 +50,12 @@ # data modify storage asset:artifact DisableCooldownMessage set value # MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション) # data modify storage asset:artifact DisableMPMessage set value +# セット装備のID (int) (オプション) + data modify storage asset:artifact EquipID set value 241 # 扱える神 (string[]) Wikiを参照 data modify storage asset:artifact CanUsedGod set value ["Flora", "Urban", "Nyaptov", "Wi-ki", "Rumor"] # カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) - data modify storage asset:artifact CustomNBT set value {Unbreakable:1b,display:{color:1050959},HideFlags:64,Enchantments:[{id:"minecraft:protection",lvl:1s}],AttributeModifiers:[{AttributeName:"generic.armor",Name:"generic.armor",Amount:2,Operation:0,UUID:[I;1,1,537,3],Slot:"feet"}]} + data modify storage asset:artifact CustomNBT set value {HideFlags:196,Unbreakable:1b,display:{color:1050959},Trim:{material:"netherite",pattern:"tsb_armor:534"},Enchantments:[{id:"minecraft:protection",lvl:1s}],AttributeModifiers:[{AttributeName:"generic.armor",Name:"generic.armor",Amount:2,Operation:0,UUID:[I;1,1,537,3],Slot:"feet"}]} # 神器の入手用function function asset:artifact/common/give diff --git a/Asset/data/asset/functions/artifact/0554.catastrophe/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0554.catastrophe/give/2.give.mcfunction index 5a0feb2a96..d3886d3938 100644 --- a/Asset/data/asset/functions/artifact/0554.catastrophe/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0554.catastrophe/give/2.give.mcfunction @@ -11,7 +11,7 @@ # 神器のID (int) スプレッドシートの値を入れる data modify storage asset:artifact ID set value 554 # 神器のベースアイテム - data modify storage asset:artifact Item set value "minecraft:player_head" + data modify storage asset:artifact Item set value "minecraft:netherite_helmet" # 神器の名前 (TextComponentString) data modify storage asset:artifact Name set value '[{"text":"†","color":"white"},{"text":"カタストロフィ","color":"gray"},{"text":"†","color":"white"}]' # 神器の説明文 (TextComponentString[]) @@ -25,7 +25,7 @@ # 神器のトリガー (string) Wikiを参照 data modify storage asset:artifact Trigger set value "onDamageFromEntity" # 神器の発動条件 (TextComponentString) (オプション) - data modify storage asset:artifact Condition set value '{"text":"繋がる総てを身に纏う"}' + # data modify storage asset:artifact Condition set value # 攻撃に関する情報 -Damage量 (literal[]/literal) Wikiを参照 (オプション) data modify storage asset:artifact AttackInfo.Damage set value 600 # 攻撃に関する情報 -攻撃タイプ (string[]) Wikiを参照 (オプション) @@ -50,10 +50,12 @@ # data modify storage asset:artifact DisableCooldownMessage set value # MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション) # data modify storage asset:artifact DisableMPMessage set value +# セット装備のID (int) (オプション) + data modify storage asset:artifact EquipID set value 242 # 扱える神 (string[]) Wikiを参照 data modify storage asset:artifact CanUsedGod set value ["Flora", "Urban", "Wi-ki"] # カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) - data modify storage asset:artifact CustomNBT set value {Unbreakable:1b,SkullOwner:{Id:[I;994325293,-761705917,-1324473476,-101849626],Properties:{textures:[{Value:"eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvYWRiN2Q4OGExNjhmNDg4MzU0Mjc0MDlmZGViYzVjOGRjYjQwNmI2ZGIyOGU1YTc5OWE4M2MzYzljMGNmNjQ4In19fQ=="}]}},AttributeModifiers:[{AttributeName:"generic.armor",Name:"generic.armor",Amount:5,Operation:0,UUID:[I;1,1,554,6],Slot:"head"},{AttributeName:"generic.armor_toughness",Name:"generic.armor_toughness",Amount:2.5,Operation:0,UUID:[I;1,1,554,6],Slot:"head"}]} + data modify storage asset:artifact CustomNBT set value {HideFlags:128,Trim:{material:"netherite",pattern:"tsb_armor:554"},Unbreakable:1b,AttributeModifiers:[{AttributeName:"generic.armor",Name:"generic.armor",Amount:5,Operation:0,UUID:[I;1,1,554,6],Slot:"head"},{AttributeName:"generic.armor_toughness",Name:"generic.armor_toughness",Amount:2.5,Operation:0,UUID:[I;1,1,554,6],Slot:"head"}]} # 神器の入手用function - function asset:artifact/common/give \ No newline at end of file + function asset:artifact/common/give diff --git a/Asset/data/asset/functions/artifact/0555.catastrophe/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0555.catastrophe/give/2.give.mcfunction index c7c37166df..772cf66b3c 100644 --- a/Asset/data/asset/functions/artifact/0555.catastrophe/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0555.catastrophe/give/2.give.mcfunction @@ -25,7 +25,7 @@ # 神器のトリガー (string) Wikiを参照 data modify storage asset:artifact Trigger set value "onDamageFromEntity" # 神器の発動条件 (TextComponentString) (オプション) - data modify storage asset:artifact Condition set value '{"text":"繋がる総てを身に纏う"}' + # data modify storage asset:artifact Condition set value # 攻撃に関する情報 -Damage量 (literal[]/literal) Wikiを参照 (オプション) data modify storage asset:artifact AttackInfo.Damage set value 600 # 攻撃に関する情報 -攻撃タイプ (string[]) Wikiを参照 (オプション) @@ -50,10 +50,12 @@ # data modify storage asset:artifact DisableCooldownMessage set value # MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション) # data modify storage asset:artifact DisableMPMessage set value +# セット装備のID (int) (オプション) + data modify storage asset:artifact EquipID set value 242 # 扱える神 (string[]) Wikiを参照 data modify storage asset:artifact CanUsedGod set value ["Flora", "Urban", "Wi-ki"] # カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) - data modify storage asset:artifact CustomNBT set value {Unbreakable:1b,AttributeModifiers:[{AttributeName:"generic.armor",Name:"generic.armor",Amount:8,Operation:0,UUID:[I;1,1,555,5],Slot:"chest"},{AttributeName:"generic.armor_toughness",Name:"generic.armor_toughness",Amount:2.5,Operation:0,UUID:[I;1,1,555,5],Slot:"chest"}]} + data modify storage asset:artifact CustomNBT set value {HideFlags:128,Trim:{material:"netherite",pattern:"tsb_armor:554"},Unbreakable:1b,AttributeModifiers:[{AttributeName:"generic.armor",Name:"generic.armor",Amount:8,Operation:0,UUID:[I;1,1,555,5],Slot:"chest"},{AttributeName:"generic.armor_toughness",Name:"generic.armor_toughness",Amount:2.5,Operation:0,UUID:[I;1,1,555,5],Slot:"chest"}]} # 神器の入手用function - function asset:artifact/common/give \ No newline at end of file + function asset:artifact/common/give diff --git a/Asset/data/asset/functions/artifact/0555.catastrophe/trigger/2.check_condition.mcfunction b/Asset/data/asset/functions/artifact/0555.catastrophe/trigger/2.check_condition.mcfunction index a1599411af..4a10f9b86f 100644 --- a/Asset/data/asset/functions/artifact/0555.catastrophe/trigger/2.check_condition.mcfunction +++ b/Asset/data/asset/functions/artifact/0555.catastrophe/trigger/2.check_condition.mcfunction @@ -7,7 +7,8 @@ # 神器の基本的な条件の確認を行うfunction、成功している場合CanUsedタグが付く auto/feet/legs/chest/head/mainhand/offhandを記載してね function asset:artifact/common/check_condition/chest # 他にアイテム等確認する場合はここに書く - # 頭(554),脚(556),足(557)がカタストロフィか確認 - execute unless data storage asset:context id{head:554,legs:556,feet:557} run tag @s remove CanUsed + data modify storage api: Argument.ID set value 242 + function api:entity/mob/effect/get/from_id + execute unless data storage api: Return.Effect{Stack:4} run tag @s remove CanUsed # CanUsedタグをチェックして3.main.mcfunctionを実行する - execute if entity @s[tag=CanUsed] run function asset:artifact/0555.catastrophe/trigger/3.main \ No newline at end of file + execute if entity @s[tag=CanUsed] run function asset:artifact/0555.catastrophe/trigger/3.main diff --git a/Asset/data/asset/functions/artifact/0556.catastrophe/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0556.catastrophe/give/2.give.mcfunction index 1800f23af3..e370cb3df6 100644 --- a/Asset/data/asset/functions/artifact/0556.catastrophe/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0556.catastrophe/give/2.give.mcfunction @@ -25,7 +25,7 @@ # 神器のトリガー (string) Wikiを参照 data modify storage asset:artifact Trigger set value "onDamageFromEntity" # 神器の発動条件 (TextComponentString) (オプション) - data modify storage asset:artifact Condition set value '{"text":"繋がる総てを身に纏う"}' + # data modify storage asset:artifact Condition set value # 攻撃に関する情報 -Damage量 (literal[]/literal) Wikiを参照 (オプション) data modify storage asset:artifact AttackInfo.Damage set value 600 # 攻撃に関する情報 -攻撃タイプ (string[]) Wikiを参照 (オプション) @@ -50,10 +50,12 @@ # data modify storage asset:artifact DisableCooldownMessage set value # MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション) # data modify storage asset:artifact DisableMPMessage set value +# セット装備のID (int) (オプション) + data modify storage asset:artifact EquipID set value 242 # 扱える神 (string[]) Wikiを参照 data modify storage asset:artifact CanUsedGod set value ["Flora", "Urban", "Wi-ki"] # カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) - data modify storage asset:artifact CustomNBT set value {Unbreakable:1b,AttributeModifiers:[{AttributeName:"generic.armor",Name:"generic.armor",Amount:6,Operation:0,UUID:[I;1,1,556,4],Slot:"legs"},{AttributeName:"generic.armor_toughness",Name:"generic.armor_toughness",Amount:2.5,Operation:0,UUID:[I;1,1,556,4],Slot:"legs"}]} + data modify storage asset:artifact CustomNBT set value {HideFlags:128,Trim:{material:"netherite",pattern:"tsb_armor:554_leggings"},Unbreakable:1b,AttributeModifiers:[{AttributeName:"generic.armor",Name:"generic.armor",Amount:6,Operation:0,UUID:[I;1,1,556,4],Slot:"legs"},{AttributeName:"generic.armor_toughness",Name:"generic.armor_toughness",Amount:2.5,Operation:0,UUID:[I;1,1,556,4],Slot:"legs"}]} # 神器の入手用function - function asset:artifact/common/give \ No newline at end of file + function asset:artifact/common/give diff --git a/Asset/data/asset/functions/artifact/0557.catastrophe/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0557.catastrophe/give/2.give.mcfunction index 7e980ad4a3..c3c27e1eea 100644 --- a/Asset/data/asset/functions/artifact/0557.catastrophe/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0557.catastrophe/give/2.give.mcfunction @@ -25,7 +25,7 @@ # 神器のトリガー (string) Wikiを参照 data modify storage asset:artifact Trigger set value "onDamageFromEntity" # 神器の発動条件 (TextComponentString) (オプション) - data modify storage asset:artifact Condition set value '{"text":"繋がる総てを身に纏う"}' + # data modify storage asset:artifact Condition set value # 攻撃に関する情報 -Damage量 (literal[]/literal) Wikiを参照 (オプション) data modify storage asset:artifact AttackInfo.Damage set value 600 # 攻撃に関する情報 -攻撃タイプ (string[]) Wikiを参照 (オプション) @@ -50,10 +50,12 @@ # data modify storage asset:artifact DisableCooldownMessage set value # MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション) # data modify storage asset:artifact DisableMPMessage set value +# セット装備のID (int) (オプション) + data modify storage asset:artifact EquipID set value 242 # 扱える神 (string[]) Wikiを参照 data modify storage asset:artifact CanUsedGod set value ["Flora", "Urban", "Wi-ki"] # カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) - data modify storage asset:artifact CustomNBT set value {Unbreakable:1b,AttributeModifiers:[{AttributeName:"generic.armor",Name:"generic.armor",Amount:5,Operation:0,UUID:[I;1,1,557,3],Slot:"feet"},{AttributeName:"generic.armor_toughness",Name:"generic.armor_toughness",Amount:2.5,Operation:0,UUID:[I;1,1,557,3],Slot:"feet"}]} + data modify storage asset:artifact CustomNBT set value {HideFlags:128,Trim:{material:"netherite",pattern:"tsb_armor:554_leggings"},Unbreakable:1b,AttributeModifiers:[{AttributeName:"generic.armor",Name:"generic.armor",Amount:6,Operation:0,UUID:[I;1,1,556,4],Slot:"legs"},{AttributeName:"generic.armor_toughness",Name:"generic.armor_toughness",Amount:2.5,Operation:0,UUID:[I;1,1,556,4],Slot:"legs"}]} # 神器の入手用function - function asset:artifact/common/give \ No newline at end of file + function asset:artifact/common/give diff --git a/Asset/data/asset/functions/artifact/0558.solitariness/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0558.solitariness/give/2.give.mcfunction index f970854265..758af11d0e 100644 --- a/Asset/data/asset/functions/artifact/0558.solitariness/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0558.solitariness/give/2.give.mcfunction @@ -49,11 +49,13 @@ # クールダウンによる使用不可のメッセージを非表示にするか否か (boolean) (オプション) # data modify storage asset:artifact DisableCooldownMessage set value # MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション) - # data modify storage asset:artifact DisableMPMessage set value + data modify storage asset:artifact DisableMPMessage set value true +# セット装備のID (int) (オプション) + data modify storage asset:artifact EquipID set value 236 # 扱える神 (string[]) Wikiを参照 data modify storage asset:artifact CanUsedGod set value ["Flora", "Nyaptov", "Wi-ki"] # カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) data modify storage asset:artifact CustomNBT set value {HideFlags:64,Enchantments:[{id:unbreaking,lvl:3},{id:protection,lvl:5}],AttributeModifiers:[{UUID:[I;1,1,558,6],AttributeName:"generic.armor",Name:"armor",Amount:3,Operation:0,Slot:head}]} # 神器の入手用function - function asset:artifact/common/give \ No newline at end of file + function asset:artifact/common/give diff --git a/Asset/data/asset/functions/artifact/0559.solitariness/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0559.solitariness/give/2.give.mcfunction index c893af929e..4fe457258d 100644 --- a/Asset/data/asset/functions/artifact/0559.solitariness/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0559.solitariness/give/2.give.mcfunction @@ -49,11 +49,13 @@ # クールダウンによる使用不可のメッセージを非表示にするか否か (boolean) (オプション) # data modify storage asset:artifact DisableCooldownMessage set value # MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション) - # data modify storage asset:artifact DisableMPMessage set value + data modify storage asset:artifact DisableMPMessage set value false +# セット装備のID (int) (オプション) + data modify storage asset:artifact EquipID set value 236 # 扱える神 (string[]) Wikiを参照 data modify storage asset:artifact CanUsedGod set value ["Flora", "Nyaptov", "Wi-ki"] # カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) data modify storage asset:artifact CustomNBT set value {HideFlags:64,Enchantments:[{id:unbreaking,lvl:3},{id:protection,lvl:5}],AttributeModifiers:[{UUID:[I;1,1,559,5],AttributeName:"generic.armor",Name:"armor",Slot:chest,Operation:0,Amount:8}]} # 神器の入手用function - function asset:artifact/common/give \ No newline at end of file + function asset:artifact/common/give diff --git a/Asset/data/asset/functions/artifact/0559.solitariness/trigger/2.check_condition.mcfunction b/Asset/data/asset/functions/artifact/0559.solitariness/trigger/2.check_condition.mcfunction index 7e77bd18b1..b132b0ac97 100644 --- a/Asset/data/asset/functions/artifact/0559.solitariness/trigger/2.check_condition.mcfunction +++ b/Asset/data/asset/functions/artifact/0559.solitariness/trigger/2.check_condition.mcfunction @@ -7,6 +7,8 @@ # 神器の基本的な条件の確認を行うfunction、成功している場合CanUsedタグが付く auto/feet/legs/chest/head/mainhand/offhandを記載してね function asset:artifact/common/check_condition/chest # 他にアイテム等確認する場合はここに書く - execute unless data storage asset:context id{head:558,legs:560,feet:561} run tag @s remove CanUsed + data modify storage api: Argument.ID set value 236 + function api:entity/mob/effect/get/from_id + execute unless data storage api: Return.Effect{Stack:4} run tag @s remove CanUsed # CanUsedタグをチェックして3.main.mcfunctionを実行する - execute if entity @s[tag=CanUsed] run function asset:artifact/0559.solitariness/trigger/3.main \ No newline at end of file + execute if entity @s[tag=CanUsed] run function asset:artifact/0559.solitariness/trigger/3.main diff --git a/Asset/data/asset/functions/artifact/0560.solitariness/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0560.solitariness/give/2.give.mcfunction index 00d31fe101..961a4a0971 100644 --- a/Asset/data/asset/functions/artifact/0560.solitariness/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0560.solitariness/give/2.give.mcfunction @@ -49,11 +49,13 @@ # クールダウンによる使用不可のメッセージを非表示にするか否か (boolean) (オプション) # data modify storage asset:artifact DisableCooldownMessage set value # MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション) - # data modify storage asset:artifact DisableMPMessage set value + data modify storage asset:artifact DisableMPMessage set value false +# セット装備のID (int) (オプション) + data modify storage asset:artifact EquipID set value 236 # 扱える神 (string[]) Wikiを参照 data modify storage asset:artifact CanUsedGod set value ["Flora", "Nyaptov", "Wi-ki"] # カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) data modify storage asset:artifact CustomNBT set value {HideFlags:64,Enchantments:[{id:unbreaking,lvl:3},{id:protection,lvl:5}],AttributeModifiers:[{UUID:[I;1,1,560,4],AttributeName:"generic.armor",Name:"armor",Slot:legs,Operation:0,Amount:8}]} # 神器の入手用function - function asset:artifact/common/give \ No newline at end of file + function asset:artifact/common/give diff --git a/Asset/data/asset/functions/artifact/0561.solitariness/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0561.solitariness/give/2.give.mcfunction index 843d2cf93d..65fa718733 100644 --- a/Asset/data/asset/functions/artifact/0561.solitariness/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0561.solitariness/give/2.give.mcfunction @@ -49,11 +49,15 @@ # クールダウンによる使用不可のメッセージを非表示にするか否か (boolean) (オプション) # data modify storage asset:artifact DisableCooldownMessage set value # MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション) - # data modify storage asset:artifact DisableMPMessage set value + data modify storage asset:artifact DisableMPMessage set value false +# セット装備のID (int) (オプション) + data modify storage asset:artifact EquipID set value 236 +# 装備時のステータス補正 (Component[]) (オプション) + data modify storage asset:artifact Modifiers set value [{Type:"maxHealth",Slot:"feet",Amount:4,Operation:"add"}] # 扱える神 (string[]) Wikiを参照 data modify storage asset:artifact CanUsedGod set value ["Flora", "Nyaptov", "Wi-ki"] # カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) - data modify storage asset:artifact CustomNBT set value {HideFlags:64,Enchantments:[{id:unbreaking,lvl:3},{id:protection,lvl:5}],AttributeModifiers:[{UUID:[I;1,1,561,3],AttributeName:"generic.armor",Name:"armor",Slot:feet,Operation:0,Amount:3},{UUID:[I;1,1,561,3],AttributeName:"generic.max_health",Name:"max_health",Slot:feet,Operation:0,Amount:4},{UUID:[I;1,1,561,3],AttributeName:"generic.movement_speed",Name:"speed",Slot:feet,Operation:1,Amount:0.3}]} + data modify storage asset:artifact CustomNBT set value {HideFlags:64,Enchantments:[{id:unbreaking,lvl:3},{id:protection,lvl:5}],AttributeModifiers:[{UUID:[I;1,1,561,3],AttributeName:"generic.armor",Name:"armor",Slot:feet,Operation:0,Amount:3},{UUID:[I;1,1,561,3],AttributeName:"generic.movement_speed",Name:"speed",Slot:feet,Operation:1,Amount:0.3}]} # 神器の入手用function - function asset:artifact/common/give \ No newline at end of file + function asset:artifact/common/give diff --git a/Asset/data/asset/functions/artifact/0562.heartland/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0562.heartland/give/2.give.mcfunction index 22e2b88dd4..04085a7b36 100644 --- a/Asset/data/asset/functions/artifact/0562.heartland/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0562.heartland/give/2.give.mcfunction @@ -50,10 +50,14 @@ # data modify storage asset:artifact DisableCooldownMessage set value # MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション) # data modify storage asset:artifact DisableMPMessage set value +# セット装備のID (int) (オプション) + data modify storage asset:artifact EquipID set value 237 +# 装備時のステータス補正 (Component[]) (オプション) + data modify storage asset:artifact Modifiers set value [{Type:"maxHealth",Slot:"head",Amount:4,Operation:"add"}] # 扱える神 (string[]) Wikiを参照 data modify storage asset:artifact CanUsedGod set value ["Flora", "Nyaptov", "Rumor"] # カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) - data modify storage asset:artifact CustomNBT set value {display:{color:26112},HideFlags:64,Unbreakable:1b,Enchantments:[{id:unbreaking,lvl:3},{id:protection,lvl:5},{id:mending,lvl:1}],AttributeModifiers:[{UUID:[I;1,1,562,6],AttributeName:"generic.armor",Name:"armor",Amount:3,Operation:0,Slot:head},{UUID:[I;1,1,562,6],AttributeName:"generic.max_health",Name:"max_health",Amount:4,Operation:0,Slot:head}]} + data modify storage asset:artifact CustomNBT set value {display:{color:26112},HideFlags:64,Unbreakable:1b,Enchantments:[{id:unbreaking,lvl:3},{id:protection,lvl:5},{id:mending,lvl:1}],AttributeModifiers:[{UUID:[I;1,1,562,6],AttributeName:"generic.armor",Name:"armor",Amount:3,Operation:0,Slot:head}]} # 神器の入手用function function asset:artifact/common/give diff --git a/Asset/data/asset/functions/artifact/0563.heartland/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0563.heartland/give/2.give.mcfunction index b59da27725..4e1dab9257 100644 --- a/Asset/data/asset/functions/artifact/0563.heartland/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0563.heartland/give/2.give.mcfunction @@ -25,7 +25,7 @@ # 神器のトリガー (string) Wikiを参照 data modify storage asset:artifact Trigger set value "passive" # 神器の発動条件 (TextComponentString) (オプション) - data modify storage asset:artifact Condition set value '[{"text":"大地の衣で全身を覆う"}]' + # 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を参照 (オプション) @@ -50,10 +50,14 @@ # data modify storage asset:artifact DisableCooldownMessage set value # MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション) # data modify storage asset:artifact DisableMPMessage set value +# セット装備のID (int) (オプション) + data modify storage asset:artifact EquipID set value 237 +# 装備時のステータス補正 (Component[]) (オプション) + data modify storage asset:artifact Modifiers set value [{Type:"maxHealth",Slot:"chest",Amount:4,Operation:"add"}] # 扱える神 (string[]) Wikiを参照 data modify storage asset:artifact CanUsedGod set value ["Flora", "Nyaptov", "Rumor"] # カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) - data modify storage asset:artifact CustomNBT set value {display:{color:26112},HideFlags:64,Unbreakable:1b,Enchantments:[{id:unbreaking,lvl:3},{id:protection,lvl:5},{id:mending,lvl:1}],AttributeModifiers:[{UUID:[I;1,1,563,5],AttributeName:"generic.armor",Name:"armor",Slot:chest,Operation:0,Amount:3},{UUID:[I;1,1,563,5],AttributeName:"generic.max_health",Name:"max_health",Slot:chest,Operation:0,Amount:4}]} + data modify storage asset:artifact CustomNBT set value {display:{color:26112},HideFlags:64,Unbreakable:1b,Enchantments:[{id:unbreaking,lvl:3},{id:protection,lvl:5},{id:mending,lvl:1}],AttributeModifiers:[{UUID:[I;1,1,563,5],AttributeName:"generic.armor",Name:"armor",Slot:chest,Operation:0,Amount:3}]} # 神器の入手用function - function asset:artifact/common/give \ No newline at end of file + function asset:artifact/common/give diff --git a/Asset/data/asset/functions/artifact/0563.heartland/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0563.heartland/trigger/3.main.mcfunction deleted file mode 100644 index 6991fd465c..0000000000 --- a/Asset/data/asset/functions/artifact/0563.heartland/trigger/3.main.mcfunction +++ /dev/null @@ -1,12 +0,0 @@ -#> asset:artifact/0563.heartland/trigger/3.main -# -# 神器のメイン処理部 -# -# @within function asset:artifact/0563.heartland/trigger/2.check_condition - -# 基本的な使用時の処理(MP消費や使用回数の処理など)を行う - function asset:artifact/common/use/chest - -# ここから先は神器側の効果の処理を書く - # 周囲5mのプレイヤーに既に自然回復エフェクトが付与されているかどうかを検知し、自然回復エフェクトを付与 - execute as @a[distance=..5] if predicate asset:artifact/0563.heartland/regene_check run effect give @a[distance=..5] regeneration 15 1 false \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0564.heartland/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0564.heartland/give/2.give.mcfunction index 0189c633b7..12400c21a4 100644 --- a/Asset/data/asset/functions/artifact/0564.heartland/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0564.heartland/give/2.give.mcfunction @@ -50,10 +50,14 @@ # data modify storage asset:artifact DisableCooldownMessage set value # MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション) # data modify storage asset:artifact DisableMPMessage set value +# セット装備のID (int) (オプション) + data modify storage asset:artifact EquipID set value 237 +# 装備時のステータス補正 (Component[]) (オプション) + data modify storage asset:artifact Modifiers set value [{Type:"maxHealth",Slot:"legs",Amount:4,Operation:"add"}] # 扱える神 (string[]) Wikiを参照 data modify storage asset:artifact CanUsedGod set value ["Flora", "Nyaptov", "Rumor"] # カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) - data modify storage asset:artifact CustomNBT set value {display:{color:26112},HideFlags:64,Unbreakable:1b,Enchantments:[{id:unbreaking,lvl:3},{id:protection,lvl:5},{id:mending,lvl:1}],AttributeModifiers:[{UUID:[I;1,1,564,4],AttributeName:"generic.armor",Name:"armor",Slot:legs,Operation:0,Amount:3},{UUID:[I;1,1,564,4],AttributeName:"generic.max_health",Name:"max_health",Slot:legs,Operation:0,Amount:4}]} + data modify storage asset:artifact CustomNBT set value {display:{color:26112},HideFlags:64,Unbreakable:1b,Enchantments:[{id:unbreaking,lvl:3},{id:protection,lvl:5},{id:mending,lvl:1}],AttributeModifiers:[{UUID:[I;1,1,564,4],AttributeName:"generic.armor",Name:"armor",Slot:legs,Operation:0,Amount:3}]} # 神器の入手用function - function asset:artifact/common/give \ No newline at end of file + function asset:artifact/common/give diff --git a/Asset/data/asset/functions/artifact/0565.heartland/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0565.heartland/give/2.give.mcfunction index 2f10e0da30..fb8e2fc812 100644 --- a/Asset/data/asset/functions/artifact/0565.heartland/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0565.heartland/give/2.give.mcfunction @@ -50,10 +50,14 @@ # data modify storage asset:artifact DisableCooldownMessage set value # MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション) # data modify storage asset:artifact DisableMPMessage set value +# セット装備のID (int) (オプション) + data modify storage asset:artifact EquipID set value 237 +# 装備時のステータス補正 (Component[]) (オプション) + data modify storage asset:artifact Modifiers set value [{Type:"maxHealth",Slot:"feet",Amount:4,Operation:"add"}] # 扱える神 (string[]) Wikiを参照 data modify storage asset:artifact CanUsedGod set value ["Flora", "Nyaptov", "Rumor"] # カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) - data modify storage asset:artifact CustomNBT set value {display:{color:26112},HideFlags:64,Unbreakable:1b,Enchantments:[{id:unbreaking,lvl:3},{id:protection,lvl:5},{id:mending,lvl:1}],AttributeModifiers:[{UUID:[I;1,1,565,3],AttributeName:"generic.armor",Name:"armor",Slot:feet,Operation:0,Amount:3},{UUID:[I;1,1,565,3],AttributeName:"generic.max_health",Name:"max_health",Slot:feet,Operation:0,Amount:4},{UUID:[I;1,1,565,3],AttributeName:"generic.movement_speed",Name:"speed",Slot:feet,Operation:1,Amount:0.3}]} + data modify storage asset:artifact CustomNBT set value {display:{color:26112},HideFlags:64,Unbreakable:1b,Enchantments:[{id:unbreaking,lvl:3},{id:protection,lvl:5},{id:mending,lvl:1}],AttributeModifiers:[{UUID:[I;1,1,565,3],AttributeName:"generic.armor",Name:"armor",Slot:feet,Operation:0,Amount:3},{UUID:[I;1,1,565,3],AttributeName:"generic.max_health",Name:"max_health",Slot:feet,Operation:0,Amount:4}]} # 神器の入手用function - function asset:artifact/common/give \ No newline at end of file + function asset:artifact/common/give diff --git a/Asset/data/asset/functions/artifact/0624.flame_helm/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0624.flame_helm/give/2.give.mcfunction index 9ff2ac1956..e7458af3f4 100644 --- a/Asset/data/asset/functions/artifact/0624.flame_helm/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0624.flame_helm/give/2.give.mcfunction @@ -15,7 +15,7 @@ # 神器の名前 (TextComponentString) data modify storage asset:artifact Name set value '{"text":"フレイムヘルム","color":"red"}' # 神器の説明文 (TextComponentString[]) - data modify storage asset:artifact Lore set value ['{"text":"火耐性+3% 火攻撃+3%","color":"red"}'] + data modify storage asset:artifact Lore set value [] # MP以外の消費物 (TextComponentString) (オプション) # data modify storage asset:artifact CostText set value # 使用回数 (int) (オプション) @@ -50,10 +50,14 @@ # data modify storage asset:artifact DisableCooldownMessage set value # MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション) # data modify storage asset:artifact DisableMPMessage set value +# セット装備のID (int) (オプション) + data modify storage asset:artifact EquipID set value 233 +# 装備時のステータス補正 (Component[]) (オプション) + data modify storage asset:artifact Modifiers set value [{Type:"attackFire",Slot:"head",Amount:0.03d,Operation:"multiply_base"},{Type:"defenseFire",Slot:"head",Amount:0.03d,Operation:"multiply_base"}] # 扱える神 (string[]) Wikiを参照 data modify storage asset:artifact CanUsedGod set value ["Urban", "Nyaptov", "Rumor"] # カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) data modify storage asset:artifact CustomNBT set value {HideFlags:68,display:{color:16720899},Unbreakable:1b,AttributeModifiers:[{AttributeName:"generic.armor",Name:"generic.armor",Amount:2,Operation:0,UUID:[I;1,1,624,6],Slot:"head"},{AttributeName:"generic.armor_toughness",Name:"generic.armor_toughness",Amount:0.5,Operation:0,UUID:[I;1,1,624,6],Slot:"head"}]} # 神器の入手用function - function asset:artifact/common/give \ No newline at end of file + function asset:artifact/common/give diff --git a/Asset/data/asset/functions/artifact/0624.flame_helm/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0624.flame_helm/trigger/3.main.mcfunction index 79f06e3823..99cb2ab0fc 100644 --- a/Asset/data/asset/functions/artifact/0624.flame_helm/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/0624.flame_helm/trigger/3.main.mcfunction @@ -9,21 +9,6 @@ # ここから先は神器側の効果の処理を書く -# 火耐性+3% - data modify storage api: Argument.UUID set value [I;1,1,624,6] - data modify storage api: Argument.Amount set value 0.03 - data modify storage api: Argument.Operation set value "multiply_base" - function api:modifier/defense/fire/add - -# 火攻撃+3% - data modify storage api: Argument.UUID set value [I;1,1,624,6] - data modify storage api: Argument.Amount set value 0.03 - data modify storage api: Argument.Operation set value "multiply_base" - function api:modifier/attack/fire/add - # 演出 particle flame ~ ~1.6 ~ 0.4 0.2 0.4 0 10 normal @a playsound minecraft:entity.blaze.shoot player @a ~ ~ ~ 0.4 1 - -# 一式検知 - execute if data storage asset:context id.all{head:624,chest:625,legs:626,feet:627} run function asset:artifact/0625.flame_armor/trigger/4.fullset \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0624.flame_helm/trigger/dis_equip/main.mcfunction b/Asset/data/asset/functions/artifact/0624.flame_helm/trigger/dis_equip/main.mcfunction index ef27e01d49..8994e12d0f 100644 --- a/Asset/data/asset/functions/artifact/0624.flame_helm/trigger/dis_equip/main.mcfunction +++ b/Asset/data/asset/functions/artifact/0624.flame_helm/trigger/dis_equip/main.mcfunction @@ -4,16 +4,5 @@ # # @within function asset:artifact/0624.flame_helm/trigger/dis_equip/ -# 火耐性+3% - data modify storage api: Argument.UUID set value [I;1,1,624,6] - function api:modifier/defense/fire/remove - -# 火攻撃+3% - data modify storage api: Argument.UUID set value [I;1,1,624,6] - function api:modifier/attack/fire/remove - # 演出 playsound entity.generic.burn player @a ~ ~ ~ 0.2 1 0 - -# フルセット効果を削除 - execute if entity @s[tag=HD.Fullset] run function asset:artifact/0625.flame_armor/trigger/5.fullset_dis_equip \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0625.flame_armor/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0625.flame_armor/give/2.give.mcfunction index 37b74c3e19..9a74ffe487 100644 --- a/Asset/data/asset/functions/artifact/0625.flame_armor/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0625.flame_armor/give/2.give.mcfunction @@ -15,7 +15,7 @@ # 神器の名前 (TextComponentString) data modify storage asset:artifact Name set value '{"text":"フレイムアーマー","color":"red"}' # 神器の説明文 (TextComponentString[]) - data modify storage asset:artifact Lore set value ['[{"text":"火耐性+3% 火攻撃+3%","color":"red"}]','[{"text":"一式揃えた場合、追加で","color":"white"}]','[{"text":"火耐性+3% 火攻撃+3%","color":"red"}]'] + data modify storage asset:artifact Lore set value [] # MP以外の消費物 (TextComponentString) (オプション) # data modify storage asset:artifact CostText set value # 使用回数 (int) (オプション) @@ -50,10 +50,14 @@ # data modify storage asset:artifact DisableCooldownMessage set value # MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション) # data modify storage asset:artifact DisableMPMessage set value +# セット装備のID (int) (オプション) + data modify storage asset:artifact EquipID set value 233 +# 装備時のステータス補正 (Component[]) (オプション) + data modify storage asset:artifact Modifiers set value [{Type:"attackFire",Slot:"chest",Amount:0.03d,Operation:"multiply_base"},{Type:"defenseFire",Slot:"chest",Amount:0.03d,Operation:"multiply_base"}] # 扱える神 (string[]) Wikiを参照 data modify storage asset:artifact CanUsedGod set value ["Urban", "Nyaptov", "Rumor"] # カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) data modify storage asset:artifact CustomNBT set value {HideFlags:68,display:{color:16720899},Unbreakable:1b,AttributeModifiers:[{AttributeName:"generic.armor",Name:"generic.armor",Amount:6,Operation:0,UUID:[I;1,1,625,5],Slot:"chest"},{AttributeName:"generic.armor_toughness",Name:"generic.armor_toughness",Amount:0.5,Operation:0,UUID:[I;1,1,625,5],Slot:"chest"}]} # 神器の入手用function - function asset:artifact/common/give \ No newline at end of file + function asset:artifact/common/give diff --git a/Asset/data/asset/functions/artifact/0625.flame_armor/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0625.flame_armor/trigger/3.main.mcfunction index 62241f31dc..b6295b488f 100644 --- a/Asset/data/asset/functions/artifact/0625.flame_armor/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/0625.flame_armor/trigger/3.main.mcfunction @@ -9,21 +9,6 @@ # ここから先は神器側の効果の処理を書く -# 火耐性+3% - data modify storage api: Argument.UUID set value [I;1,1,625,5] - data modify storage api: Argument.Amount set value 0.03 - data modify storage api: Argument.Operation set value "multiply_base" - function api:modifier/defense/fire/add - -# 火攻撃+3% - data modify storage api: Argument.UUID set value [I;1,1,625,5] - data modify storage api: Argument.Amount set value 0.03 - data modify storage api: Argument.Operation set value "multiply_base" - function api:modifier/attack/fire/add - # 演出 particle flame ~ ~1.3 ~ 0.4 0.3 0.4 0 10 normal @a playsound minecraft:entity.blaze.shoot player @a ~ ~ ~ 0.4 1 - -# 一式検知 - execute if data storage asset:context id.all{head:624,chest:625,legs:626,feet:627} run function asset:artifact/0625.flame_armor/trigger/4.fullset \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0625.flame_armor/trigger/5.fullset_dis_equip.mcfunction b/Asset/data/asset/functions/artifact/0625.flame_armor/trigger/5.fullset_dis_equip.mcfunction deleted file mode 100644 index 25371bd5a8..0000000000 --- a/Asset/data/asset/functions/artifact/0625.flame_armor/trigger/5.fullset_dis_equip.mcfunction +++ /dev/null @@ -1,20 +0,0 @@ -#> asset:artifact/0625.flame_armor/trigger/5.fullset_dis_equip -# -# -# -# @within function -# asset:artifact/0624.flame_helm/trigger/dis_equip/main -# asset:artifact/0625.flame_armor/trigger/dis_equip/main -# asset:artifact/0626.flame_leggings/trigger/dis_equip/main -# asset:artifact/0627.flame_boots/trigger/dis_equip/main - -# Tag削除 - tag @s remove HD.Fullset - -# 火耐性+3% - data modify storage api: Argument.UUID set value [I;1,1,625,0] - function api:modifier/defense/fire/remove - -# 火耐性+3% - data modify storage api: Argument.UUID set value [I;1,1,625,0] - function api:modifier/attack/fire/remove \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0625.flame_armor/trigger/_index.d.mcfunction b/Asset/data/asset/functions/artifact/0625.flame_armor/trigger/_index.d.mcfunction deleted file mode 100644 index b5ad705aa4..0000000000 --- a/Asset/data/asset/functions/artifact/0625.flame_armor/trigger/_index.d.mcfunction +++ /dev/null @@ -1,10 +0,0 @@ -#> asset:artifact/0625.flame_armor/trigger/_index.d -# @private -# -#> Tag -# @within function -# asset:artifact/0624.flame_helm/trigger/dis_equip/main -# asset:artifact/0625.flame_armor/trigger/** -# asset:artifact/0626.flame_leggings/trigger/dis_equip/main -# asset:artifact/0627.flame_boots/trigger/dis_equip/main - #declare tag HD.Fullset \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0625.flame_armor/trigger/dis_equip/main.mcfunction b/Asset/data/asset/functions/artifact/0625.flame_armor/trigger/dis_equip/main.mcfunction index 833e0b967d..2d0c807b2c 100644 --- a/Asset/data/asset/functions/artifact/0625.flame_armor/trigger/dis_equip/main.mcfunction +++ b/Asset/data/asset/functions/artifact/0625.flame_armor/trigger/dis_equip/main.mcfunction @@ -4,16 +4,5 @@ # # @within function asset:artifact/0625.flame_armor/trigger/dis_equip/ -# 火耐性+3% - data modify storage api: Argument.UUID set value [I;1,1,625,5] - function api:modifier/defense/fire/remove - -# 火攻撃+3% - data modify storage api: Argument.UUID set value [I;1,1,625,5] - function api:modifier/attack/fire/remove - # 演出 playsound entity.generic.burn player @a ~ ~ ~ 0.2 1 0 - -# フルセット効果を削除 - execute if entity @s[tag=HD.Fullset] run function asset:artifact/0625.flame_armor/trigger/5.fullset_dis_equip \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0626.flame_leggings/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0626.flame_leggings/give/2.give.mcfunction index 33c332c6b0..e48edd0fc6 100644 --- a/Asset/data/asset/functions/artifact/0626.flame_leggings/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0626.flame_leggings/give/2.give.mcfunction @@ -15,7 +15,7 @@ # 神器の名前 (TextComponentString) data modify storage asset:artifact Name set value '{"text":"フレイムレギンス","color":"red"}' # 神器の説明文 (TextComponentString[]) - data modify storage asset:artifact Lore set value ['{"text":"火耐性+3% 火攻撃+3%","color":"red"}'] + data modify storage asset:artifact Lore set value [] # MP以外の消費物 (TextComponentString) (オプション) # data modify storage asset:artifact CostText set value # 使用回数 (int) (オプション) @@ -50,10 +50,14 @@ # data modify storage asset:artifact DisableCooldownMessage set value # MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション) # data modify storage asset:artifact DisableMPMessage set value +# セット装備のID (int) (オプション) + data modify storage asset:artifact EquipID set value 233 +# 装備時のステータス補正 (Component[]) (オプション) + data modify storage asset:artifact Modifiers set value [{Type:"attackFire",Slot:"legs",Amount:0.03d,Operation:"multiply_base"},{Type:"defenseFire",Slot:"legs",Amount:0.03d,Operation:"multiply_base"}] # 扱える神 (string[]) Wikiを参照 data modify storage asset:artifact CanUsedGod set value ["Urban", "Nyaptov", "Rumor"] # カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) data modify storage asset:artifact CustomNBT set value {HideFlags:68,display:{color:16720899},Unbreakable:1b,AttributeModifiers:[{AttributeName:"generic.armor",Name:"generic.armor",Amount:5,Operation:0,UUID:[I;1,1,626,4],Slot:"legs"},{AttributeName:"generic.armor_toughness",Name:"generic.armor_toughness",Amount:0.5,Operation:0,UUID:[I;1,1,626,4],Slot:"legs"}]} # 神器の入手用function - function asset:artifact/common/give \ No newline at end of file + function asset:artifact/common/give diff --git a/Asset/data/asset/functions/artifact/0627.flame_boots/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0627.flame_boots/give/2.give.mcfunction index 2b92a2e924..914326b327 100644 --- a/Asset/data/asset/functions/artifact/0627.flame_boots/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0627.flame_boots/give/2.give.mcfunction @@ -15,7 +15,7 @@ # 神器の名前 (TextComponentString) data modify storage asset:artifact Name set value '{"text":"フレイムブーツ","color":"red"}' # 神器の説明文 (TextComponentString[]) - data modify storage asset:artifact Lore set value ['{"text":"火耐性+3% 火攻撃+3%","color":"red"}'] + data modify storage asset:artifact Lore set value [] # MP以外の消費物 (TextComponentString) (オプション) # data modify storage asset:artifact CostText set value # 使用回数 (int) (オプション) @@ -50,10 +50,14 @@ # data modify storage asset:artifact DisableCooldownMessage set value # MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション) # data modify storage asset:artifact DisableMPMessage set value +# セット装備のID (int) (オプション) + data modify storage asset:artifact EquipID set value 233 +# 装備時のステータス補正 (Component[]) (オプション) + data modify storage asset:artifact Modifiers set value [{Type:"attackFire",Slot:"feet",Amount:0.03d,Operation:"multiply_base"},{Type:"defenseFire",Slot:"feet",Amount:0.03d,Operation:"multiply_base"}] # 扱える神 (string[]) Wikiを参照 data modify storage asset:artifact CanUsedGod set value ["Urban", "Nyaptov", "Rumor"] # カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) data modify storage asset:artifact CustomNBT set value {HideFlags:68,display:{color:16720899},Unbreakable:1b,AttributeModifiers:[{AttributeName:"generic.armor",Name:"generic.armor",Amount:2,Operation:0,UUID:[I;1,1,627,3],Slot:"feet"},{AttributeName:"generic.armor_toughness",Name:"generic.armor_toughness",Amount:0.5,Operation:0,UUID:[I;1,1,627,3],Slot:"feet"}]} # 神器の入手用function - function asset:artifact/common/give \ No newline at end of file + function asset:artifact/common/give diff --git a/Asset/data/asset/functions/artifact/0627.flame_boots/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0627.flame_boots/trigger/3.main.mcfunction index 1e9142d5d9..9ba39742c0 100644 --- a/Asset/data/asset/functions/artifact/0627.flame_boots/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/0627.flame_boots/trigger/3.main.mcfunction @@ -9,21 +9,6 @@ # ここから先は神器側の効果の処理を書く -# 火耐性+3% - data modify storage api: Argument.UUID set value [I;1,1,627,3] - data modify storage api: Argument.Amount set value 0.03 - data modify storage api: Argument.Operation set value "multiply_base" - function api:modifier/defense/fire/add - -# 火攻撃+3% - data modify storage api: Argument.UUID set value [I;1,1,627,3] - data modify storage api: Argument.Amount set value 0.03 - data modify storage api: Argument.Operation set value "multiply_base" - function api:modifier/attack/fire/add - # 演出 particle flame ~ ~0.3 ~ 0.4 0.2 0.4 0 10 normal @a playsound minecraft:entity.blaze.shoot player @a ~ ~ ~ 0.4 1 - -# 一式検知 - execute if data storage asset:context id.all{head:624,chest:625,legs:626,feet:627} run function asset:artifact/0625.flame_armor/trigger/4.fullset diff --git a/Asset/data/asset/functions/artifact/0627.flame_boots/trigger/dis_equip/main.mcfunction b/Asset/data/asset/functions/artifact/0627.flame_boots/trigger/dis_equip/main.mcfunction index 5a4aa0c248..3807eb29aa 100644 --- a/Asset/data/asset/functions/artifact/0627.flame_boots/trigger/dis_equip/main.mcfunction +++ b/Asset/data/asset/functions/artifact/0627.flame_boots/trigger/dis_equip/main.mcfunction @@ -4,16 +4,5 @@ # # @within function asset:artifact/0627.flame_boots/trigger/dis_equip/ -# 火耐性+3% - data modify storage api: Argument.UUID set value [I;1,1,627,3] - function api:modifier/defense/fire/remove - -# 火攻撃+3% - data modify storage api: Argument.UUID set value [I;1,1,627,3] - function api:modifier/attack/fire/remove - # 演出 playsound entity.generic.burn player @a ~ ~ ~ 0.2 1 0 - -# フルセット効果を削除 - execute if entity @s[tag=HD.Fullset] run function asset:artifact/0625.flame_armor/trigger/5.fullset_dis_equip \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0628.ice_helm/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0628.ice_helm/give/2.give.mcfunction index 6e32373f3f..4c172d4f4d 100644 --- a/Asset/data/asset/functions/artifact/0628.ice_helm/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0628.ice_helm/give/2.give.mcfunction @@ -15,7 +15,7 @@ # 神器の名前 (TextComponentString) data modify storage asset:artifact Name set value '{"text":"アイスヘルム","color":"aqua"}' # 神器の説明文 (TextComponentString[]) - data modify storage asset:artifact Lore set value ['[{"text":"水耐性+3% 水攻撃+3%","color":"aqua"}]'] + data modify storage asset:artifact Lore set value [] # MP以外の消費物 (TextComponentString) (オプション) # data modify storage asset:artifact CostText set value # 使用回数 (int) (オプション) @@ -50,10 +50,14 @@ # data modify storage asset:artifact DisableCooldownMessage set value # MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション) # data modify storage asset:artifact DisableMPMessage set value +# セット装備のID (int) (オプション) + data modify storage asset:artifact EquipID set value 234 +# 装備時のステータス補正 (Component[]) (オプション) + data modify storage asset:artifact Modifiers set value [{Type:"attackWater",Slot:"head",Amount:0.03d,Operation:"multiply_base"},{Type:"defenseWater",Slot:"head",Amount:0.03d,Operation:"multiply_base"}] # 扱える神 (string[]) Wikiを参照 data modify storage asset:artifact CanUsedGod set value ["Flora", "Urban", "Wi-ki", "Rumor"] # カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) data modify storage asset:artifact CustomNBT set value {HideFlags:68,display:{color:7274495},Unbreakable:1b,AttributeModifiers:[{AttributeName:"generic.armor",Name:"generic.armor",Amount:2,Operation:0,UUID:[I;1,1,628,6],Slot:"head"},{AttributeName:"generic.armor_toughness",Name:"generic.armor_toughness",Amount:0.5,Operation:0,UUID:[I;1,1,628,6],Slot:"head"}]} # 神器の入手用function - function asset:artifact/common/give \ No newline at end of file + function asset:artifact/common/give diff --git a/Asset/data/asset/functions/artifact/0628.ice_helm/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0628.ice_helm/trigger/3.main.mcfunction index 701d7b8427..176287e174 100644 --- a/Asset/data/asset/functions/artifact/0628.ice_helm/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/0628.ice_helm/trigger/3.main.mcfunction @@ -9,22 +9,7 @@ # ここから先は神器側の効果の処理を書く -# 水耐性+3% - data modify storage api: Argument.UUID set value [I;1,1,628,6] - data modify storage api: Argument.Amount set value 0.03 - data modify storage api: Argument.Operation set value "multiply_base" - function api:modifier/defense/water/add - -# 水攻撃+3% - data modify storage api: Argument.UUID set value [I;1,1,628,6] - data modify storage api: Argument.Amount set value 0.03 - data modify storage api: Argument.Operation set value "multiply_base" - function api:modifier/attack/water/add - # 演出 particle falling_dust diamond_block ~ ~1.7 ~ 0.4 0.2 0.4 0 6 normal @a particle falling_dust snow_block ~ ~1.7 ~ 0.4 0.2 0.4 0 6 normal @a playsound minecraft:block.glass.break player @a ~ ~ ~ 0.4 1.2 0 - -# フルセット - execute if data storage asset:context id.all{head:628,chest:629,legs:630,feet:631} run function asset:artifact/0629.ice_armor/trigger/4.fullset \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0628.ice_helm/trigger/dis_equip/main.mcfunction b/Asset/data/asset/functions/artifact/0628.ice_helm/trigger/dis_equip/main.mcfunction index c4e7bb8c7b..a55db34717 100644 --- a/Asset/data/asset/functions/artifact/0628.ice_helm/trigger/dis_equip/main.mcfunction +++ b/Asset/data/asset/functions/artifact/0628.ice_helm/trigger/dis_equip/main.mcfunction @@ -4,16 +4,5 @@ # # @within function asset:artifact/0628.ice_helm/trigger/dis_equip/ -# 水耐性+3% - data modify storage api: Argument.UUID set value [I;1,1,628,6] - function api:modifier/defense/water/remove - -# 水攻撃+3% - data modify storage api: Argument.UUID set value [I;1,1,628,6] - function api:modifier/attack/water/remove - # 演出 playsound minecraft:block.glass.break player @a ~ ~ ~ 0.4 0.8 0 - -# フルセット効果削除 - execute if entity @s[tag=HH.Fullset] run function asset:artifact/0629.ice_armor/trigger/5.fullset_dis_equip \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0629.ice_armor/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0629.ice_armor/give/2.give.mcfunction index c4c1e97e4e..6f34709464 100644 --- a/Asset/data/asset/functions/artifact/0629.ice_armor/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0629.ice_armor/give/2.give.mcfunction @@ -15,7 +15,7 @@ # 神器の名前 (TextComponentString) data modify storage asset:artifact Name set value '{"text":"アイスアーマー","color":"aqua"}' # 神器の説明文 (TextComponentString[]) - data modify storage asset:artifact Lore set value ['[{"text":"水耐性+3% 水攻撃+3%","color":"aqua"}]','[{"text":"一式揃えた場合、追加で","color":"white"}]','[{"text":"水耐性+3% 水攻撃+3%","color":"aqua"}]'] + data modify storage asset:artifact Lore set value [] # MP以外の消費物 (TextComponentString) (オプション) # data modify storage asset:artifact CostText set value # 使用回数 (int) (オプション) @@ -50,10 +50,14 @@ # data modify storage asset:artifact DisableCooldownMessage set value # MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション) # data modify storage asset:artifact DisableMPMessage set value +# セット装備のID (int) (オプション) + data modify storage asset:artifact EquipID set value 234 +# 装備時のステータス補正 (Component[]) (オプション) + data modify storage asset:artifact Modifiers set value [{Type:"attackWater",Slot:"chest",Amount:0.03d,Operation:"multiply_base"},{Type:"defenseWater",Slot:"chest",Amount:0.03d,Operation:"multiply_base"}] # 扱える神 (string[]) Wikiを参照 data modify storage asset:artifact CanUsedGod set value ["Flora", "Urban", "Wi-ki", "Rumor"] # カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) data modify storage asset:artifact CustomNBT set value {HideFlags:68,display:{color:7274495},Unbreakable:1b,AttributeModifiers:[{AttributeName:"generic.armor",Name:"generic.armor",Amount:6,Operation:0,UUID:[I;1,1,629,5],Slot:"chest"},{AttributeName:"generic.armor_toughness",Name:"generic.armor_toughness",Amount:0.5,Operation:0,UUID:[I;1,1,629,5],Slot:"chest"}]} # 神器の入手用function - function asset:artifact/common/give \ No newline at end of file + function asset:artifact/common/give diff --git a/Asset/data/asset/functions/artifact/0629.ice_armor/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0629.ice_armor/trigger/3.main.mcfunction index 028816035d..dc3ac718e7 100644 --- a/Asset/data/asset/functions/artifact/0629.ice_armor/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/0629.ice_armor/trigger/3.main.mcfunction @@ -9,22 +9,7 @@ # ここから先は神器側の効果の処理を書く -# 水耐性+3% - data modify storage api: Argument.UUID set value [I;1,1,629,5] - data modify storage api: Argument.Amount set value 0.03 - data modify storage api: Argument.Operation set value "multiply_base" - function api:modifier/defense/water/add - -# 水攻撃+3% - data modify storage api: Argument.UUID set value [I;1,1,629,5] - data modify storage api: Argument.Amount set value 0.03 - data modify storage api: Argument.Operation set value "multiply_base" - function api:modifier/attack/water/add - # 演出 particle falling_dust diamond_block ~ ~1.4 ~ 0.4 0.2 0.4 0 7 normal @a particle falling_dust snow_block ~ ~1.4 ~ 0.4 0.2 0.4 0 7 normal @a playsound block.glass.break player @a ~ ~ ~ 0.4 1.2 0 - -# フルセット - execute if data storage asset:context id.all{head:628,chest:629,legs:630,feet:631} run function asset:artifact/0629.ice_armor/trigger/4.fullset \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0629.ice_armor/trigger/5.fullset_dis_equip.mcfunction b/Asset/data/asset/functions/artifact/0629.ice_armor/trigger/5.fullset_dis_equip.mcfunction deleted file mode 100644 index 7bd892ed07..0000000000 --- a/Asset/data/asset/functions/artifact/0629.ice_armor/trigger/5.fullset_dis_equip.mcfunction +++ /dev/null @@ -1,20 +0,0 @@ -#> asset:artifact/0629.ice_armor/trigger/5.fullset_dis_equip -# -# -# -# @within function -# asset:artifact/0628.ice_helm/trigger/dis_equip/main -# asset:artifact/0629.ice_armor/trigger/dis_equip/main -# asset:artifact/0630.ice_leggings/trigger/dis_equip/main -# asset:artifact/0631.ice_boots/trigger/dis_equip/main - -# 水耐性+3% - data modify storage api: Argument.UUID set value [I;1,1,629,0] - function api:modifier/defense/water/remove - -# 水攻撃+3% - data modify storage api: Argument.UUID set value [I;1,1,629,0] - function api:modifier/attack/water/remove - -# Tag削除 - tag @s remove HH.Fullset \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0629.ice_armor/trigger/_index.d.mcfunction b/Asset/data/asset/functions/artifact/0629.ice_armor/trigger/_index.d.mcfunction deleted file mode 100644 index 8b038fc8dc..0000000000 --- a/Asset/data/asset/functions/artifact/0629.ice_armor/trigger/_index.d.mcfunction +++ /dev/null @@ -1,10 +0,0 @@ -#> asset:artifact/0629.ice_armor/trigger/_index.d -# @private -# -#> Tag -# @within function -# asset:artifact/0628.ice_helm/** -# asset:artifact/0629.ice_armor/trigger/** -# asset:artifact/0630.ice_leggings/** -# asset:artifact/0631.ice_boots/** - #declare tag HH.Fullset \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0629.ice_armor/trigger/dis_equip/main.mcfunction b/Asset/data/asset/functions/artifact/0629.ice_armor/trigger/dis_equip/main.mcfunction index eee452dc5e..bc1cd56589 100644 --- a/Asset/data/asset/functions/artifact/0629.ice_armor/trigger/dis_equip/main.mcfunction +++ b/Asset/data/asset/functions/artifact/0629.ice_armor/trigger/dis_equip/main.mcfunction @@ -4,16 +4,5 @@ # # @within function asset:artifact/0629.ice_armor/trigger/dis_equip/ -# 水耐性+3% - data modify storage api: Argument.UUID set value [I;1,1,629,5] - function api:modifier/defense/water/remove - -# 水攻撃+3% - data modify storage api: Argument.UUID set value [I;1,1,629,5] - function api:modifier/attack/water/remove - # 演出 playsound block.glass.break player @a ~ ~ ~ 0.4 0.8 0 - -# フルセット効果削除 - execute if entity @s[tag=HH.Fullset] run function asset:artifact/0629.ice_armor/trigger/5.fullset_dis_equip \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0630.ice_leggings/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0630.ice_leggings/give/2.give.mcfunction index 10620bc746..3797dba4bf 100644 --- a/Asset/data/asset/functions/artifact/0630.ice_leggings/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0630.ice_leggings/give/2.give.mcfunction @@ -15,7 +15,7 @@ # 神器の名前 (TextComponentString) data modify storage asset:artifact Name set value '{"text":"アイスレギンス","color":"aqua"}' # 神器の説明文 (TextComponentString[]) - data modify storage asset:artifact Lore set value ['[{"text":"水耐性+3% 水攻撃+3%","color":"aqua"}]'] + data modify storage asset:artifact Lore set value [] # MP以外の消費物 (TextComponentString) (オプション) # data modify storage asset:artifact CostText set value # 使用回数 (int) (オプション) @@ -50,10 +50,14 @@ # data modify storage asset:artifact DisableCooldownMessage set value # MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション) # data modify storage asset:artifact DisableMPMessage set value +# セット装備のID (int) (オプション) + data modify storage asset:artifact EquipID set value 234 +# 装備時のステータス補正 (Component[]) (オプション) + data modify storage asset:artifact Modifiers set value [{Type:"attackWater",Slot:"legs",Amount:0.03d,Operation:"multiply_base"},{Type:"defenseWater",Slot:"legs",Amount:0.03d,Operation:"multiply_base"}] # 扱える神 (string[]) Wikiを参照 data modify storage asset:artifact CanUsedGod set value ["Flora", "Urban", "Wi-ki", "Rumor"] # カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) data modify storage asset:artifact CustomNBT set value {HideFlags:68,display:{color:7274495},Unbreakable:1b,AttributeModifiers:[{AttributeName:"generic.armor",Name:"generic.armor",Amount:5,Operation:0,UUID:[I;1,1,630,4],Slot:"legs"},{AttributeName:"generic.armor_toughness",Name:"generic.armor_toughness",Amount:0.5,Operation:0,UUID:[I;1,1,630,4],Slot:"legs"}]} # 神器の入手用function - function asset:artifact/common/give \ No newline at end of file + function asset:artifact/common/give diff --git a/Asset/data/asset/functions/artifact/0630.ice_leggings/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0630.ice_leggings/trigger/3.main.mcfunction index f8eb98cb18..3e577a2f47 100644 --- a/Asset/data/asset/functions/artifact/0630.ice_leggings/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/0630.ice_leggings/trigger/3.main.mcfunction @@ -9,22 +9,7 @@ # ここから先は神器側の効果の処理を書く -# 水耐性+3% - data modify storage api: Argument.UUID set value [I;1,1,630,4] - data modify storage api: Argument.Amount set value 0.03 - data modify storage api: Argument.Operation set value "multiply_base" - function api:modifier/defense/water/add - -# 水攻撃+3% - data modify storage api: Argument.UUID set value [I;1,1,630,4] - data modify storage api: Argument.Amount set value 0.03 - data modify storage api: Argument.Operation set value "multiply_base" - function api:modifier/attack/water/add - # 演出 particle falling_dust diamond_block ~ ~0.4 ~ 0.4 0.3 0.4 0 5 normal @a particle falling_dust snow_block ~ ~0.4 ~ 0.4 0.3 0.4 0 5 normal @a playsound minecraft:block.glass.break player @a ~ ~ ~ 0.4 1.2 0 - -# フルセット - execute if data storage asset:context id.all{head:628,chest:629,legs:630,feet:631} run function asset:artifact/0629.ice_armor/trigger/4.fullset \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0630.ice_leggings/trigger/dis_equip/main.mcfunction b/Asset/data/asset/functions/artifact/0630.ice_leggings/trigger/dis_equip/main.mcfunction index fc46894ab8..2b76ae8ff4 100644 --- a/Asset/data/asset/functions/artifact/0630.ice_leggings/trigger/dis_equip/main.mcfunction +++ b/Asset/data/asset/functions/artifact/0630.ice_leggings/trigger/dis_equip/main.mcfunction @@ -4,16 +4,5 @@ # # @within function asset:artifact/0630.ice_leggings/trigger/dis_equip/ -# 水耐性+3% - data modify storage api: Argument.UUID set value [I;1,1,630,4] - function api:modifier/defense/water/remove - -# 水攻撃+3% - data modify storage api: Argument.UUID set value [I;1,1,630,4] - function api:modifier/attack/water/remove - # 演出 playsound minecraft:block.glass.break player @a ~ ~ ~ 0.4 0.8 0 - -# フルセット効果削除 - execute if entity @s[tag=HH.Fullset] run function asset:artifact/0629.ice_armor/trigger/5.fullset_dis_equip diff --git a/Asset/data/asset/functions/artifact/0631.ice_boots/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0631.ice_boots/give/2.give.mcfunction index 8721fdaf56..eb663632d5 100644 --- a/Asset/data/asset/functions/artifact/0631.ice_boots/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0631.ice_boots/give/2.give.mcfunction @@ -15,7 +15,7 @@ # 神器の名前 (TextComponentString) data modify storage asset:artifact Name set value '{"text":"アイスブーツ","color":"aqua"}' # 神器の説明文 (TextComponentString[]) - data modify storage asset:artifact Lore set value ['[{"text":"水耐性+3% 水攻撃+3%","color":"aqua"}]'] + data modify storage asset:artifact Lore set value [] # MP以外の消費物 (TextComponentString) (オプション) # data modify storage asset:artifact CostText set value # 使用回数 (int) (オプション) @@ -50,10 +50,14 @@ # data modify storage asset:artifact DisableCooldownMessage set value # MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション) # data modify storage asset:artifact DisableMPMessage set value +# セット装備のID (int) (オプション) + data modify storage asset:artifact EquipID set value 234 +# 装備時のステータス補正 (Component[]) (オプション) + data modify storage asset:artifact Modifiers set value [{Type:"attackWater",Slot:"feet",Amount:0.03d,Operation:"multiply_base"},{Type:"defenseWater",Slot:"feet",Amount:0.03d,Operation:"multiply_base"}] # 扱える神 (string[]) Wikiを参照 data modify storage asset:artifact CanUsedGod set value ["Flora", "Urban", "Wi-ki", "Rumor"] # カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) data modify storage asset:artifact CustomNBT set value {HideFlags:68,display:{color:7274495},Unbreakable:1b,AttributeModifiers:[{AttributeName:"generic.armor",Name:"generic.armor",Amount:2,Operation:0,UUID:[I;1,1,631,3],Slot:"feet"},{AttributeName:"generic.armor_toughness",Name:"generic.armor_toughness",Amount:0.5,Operation:0,UUID:[I;1,1,631,3],Slot:"feet"}]} # 神器の入手用function - function asset:artifact/common/give \ No newline at end of file + function asset:artifact/common/give diff --git a/Asset/data/asset/functions/artifact/0631.ice_boots/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0631.ice_boots/trigger/3.main.mcfunction index e615a471c6..3801f2528f 100644 --- a/Asset/data/asset/functions/artifact/0631.ice_boots/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/0631.ice_boots/trigger/3.main.mcfunction @@ -9,22 +9,7 @@ # ここから先は神器側の効果の処理を書く -# 水耐性+3% - data modify storage api: Argument.UUID set value [I;1,1,631,3] - data modify storage api: Argument.Amount set value 0.03 - data modify storage api: Argument.Operation set value "multiply_base" - function api:modifier/defense/water/add - -# 水攻撃+3% - data modify storage api: Argument.UUID set value [I;1,1,631,3] - data modify storage api: Argument.Amount set value 0.03 - data modify storage api: Argument.Operation set value "multiply_base" - function api:modifier/attack/water/add - # 演出 particle falling_dust diamond_block ~ ~0.3 ~ 0.4 0.1 0.4 0 5 normal @a particle falling_dust snow_block ~ ~0.3 ~ 0.4 0.1 0.4 0 5 normal @a playsound minecraft:block.glass.break player @a ~ ~ ~ 0.4 1.2 0 - -# フルセット - execute if data storage asset:context id.all{head:628,chest:629,legs:630,feet:631} run function asset:artifact/0629.ice_armor/trigger/4.fullset \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0631.ice_boots/trigger/dis_equip/main.mcfunction b/Asset/data/asset/functions/artifact/0631.ice_boots/trigger/dis_equip/main.mcfunction index 46d9c61d07..8a6d7bc5ad 100644 --- a/Asset/data/asset/functions/artifact/0631.ice_boots/trigger/dis_equip/main.mcfunction +++ b/Asset/data/asset/functions/artifact/0631.ice_boots/trigger/dis_equip/main.mcfunction @@ -4,16 +4,5 @@ # # @within function asset:artifact/0631.ice_boots/trigger/dis_equip/ -# 水耐性+3% - data modify storage api: Argument.UUID set value [I;1,1,631,3] - function api:modifier/defense/water/remove - -# 水攻撃+3% - data modify storage api: Argument.UUID set value [I;1,1,631,3] - function api:modifier/attack/water/remove - # 演出 playsound minecraft:block.glass.break player @a ~ ~ ~ 0.4 0.8 0 - -# フルセット効果削除 - execute if entity @s[tag=HH.Fullset] run function asset:artifact/0629.ice_armor/trigger/5.fullset_dis_equip \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0632.elec_helm/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0632.elec_helm/give/2.give.mcfunction index bae5446d7a..0f0ec150e7 100644 --- a/Asset/data/asset/functions/artifact/0632.elec_helm/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0632.elec_helm/give/2.give.mcfunction @@ -15,7 +15,7 @@ # 神器の名前 (TextComponentString) data modify storage asset:artifact Name set value '{"text":"エレキヘルム","color":"yellow"}' # 神器の説明文 (TextComponentString[]) - data modify storage asset:artifact Lore set value ['{"text":"雷耐性+3% 雷攻撃+3%","color":"yellow"}'] + data modify storage asset:artifact Lore set value [] # MP以外の消費物 (TextComponentString) (オプション) # data modify storage asset:artifact CostText set value # 使用回数 (int) (オプション) @@ -50,10 +50,14 @@ # data modify storage asset:artifact DisableCooldownMessage set value # MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション) # data modify storage asset:artifact DisableMPMessage set value +# セット装備のID (int) (オプション) + data modify storage asset:artifact EquipID set value 235 +# 装備時のステータス補正 (Component[]) (オプション) + data modify storage asset:artifact Modifiers set value [{Type:"attackThunder",Slot:"head",Amount:0.03d,Operation:"multiply_base"},{Type:"defenseThunder",Slot:"head",Amount:0.03d,Operation:"multiply_base"}] # 扱える神 (string[]) Wikiを参照 data modify storage asset:artifact CanUsedGod set value ["Flora", "Urban", "Nyaptov", "Wi-ki"] # カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) data modify storage asset:artifact CustomNBT set value {HideFlags:68,display:{color:16776960},Unbreakable:1b,AttributeModifiers:[{AttributeName:"generic.armor",Name:"generic.armor",Amount:2,Operation:0,UUID:[I;1,1,632,6],Slot:"head"},{AttributeName:"generic.armor_toughness",Name:"generic.armor_toughness",Amount:0.5,Operation:0,UUID:[I;1,1,632,6],Slot:"head"}]} # 神器の入手用function - function asset:artifact/common/give \ No newline at end of file + function asset:artifact/common/give diff --git a/Asset/data/asset/functions/artifact/0632.elec_helm/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0632.elec_helm/trigger/3.main.mcfunction index c981942a20..f173e24852 100644 --- a/Asset/data/asset/functions/artifact/0632.elec_helm/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/0632.elec_helm/trigger/3.main.mcfunction @@ -9,22 +9,7 @@ # ここから先は神器側の効果の処理を書く -# 雷耐性+3% - data modify storage api: Argument.UUID set value [I;1,1,632,6] - data modify storage api: Argument.Amount set value 0.03 - data modify storage api: Argument.Operation set value "multiply_base" - function api:modifier/defense/thunder/add - -# 雷耐性+3% - data modify storage api: Argument.UUID set value [I;1,1,632,6] - data modify storage api: Argument.Amount set value 0.03 - data modify storage api: Argument.Operation set value "multiply_base" - function api:modifier/attack/thunder/add - # 演出 particle dust 1 1 0 1 ~ ~1.6 ~ 0.4 0.2 0.4 0 6 normal @a particle firework ~ ~1.6 ~ 0.4 0.2 0.4 0 6 normal @a playsound minecraft:entity.firework_rocket.twinkle player @a ~ ~ ~ 0.4 1.5 0 - -# 一式効果 - execute if data storage asset:context id.all{head:632,chest:633,legs:634,feet:635} run function asset:artifact/0633.elec_armor/trigger/4.fullset \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0632.elec_helm/trigger/dis_equip/main.mcfunction b/Asset/data/asset/functions/artifact/0632.elec_helm/trigger/dis_equip/main.mcfunction index 97a33bbf05..d13a9f5d55 100644 --- a/Asset/data/asset/functions/artifact/0632.elec_helm/trigger/dis_equip/main.mcfunction +++ b/Asset/data/asset/functions/artifact/0632.elec_helm/trigger/dis_equip/main.mcfunction @@ -4,16 +4,5 @@ # # @within function asset:artifact/0632.elec_helm/trigger/dis_equip/ -# 雷耐性+3% - data modify storage api: Argument.UUID set value [I;1,1,632,6] - function api:modifier/defense/thunder/remove - -# 雷攻撃+3% - data modify storage api: Argument.UUID set value [I;1,1,632,6] - function api:modifier/attack/thunder/remove - # 演出 playsound minecraft:entity.firework_rocket.twinkle player @a ~ ~ ~ 0.4 1.1 0 - -# 一式効果削除 - execute if entity @s[tag=HL.Fullset] run function asset:artifact/0633.elec_armor/trigger/5.fullset_dis_equip diff --git a/Asset/data/asset/functions/artifact/0633.elec_armor/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0633.elec_armor/give/2.give.mcfunction index 41093ad6e3..ab75b64538 100644 --- a/Asset/data/asset/functions/artifact/0633.elec_armor/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0633.elec_armor/give/2.give.mcfunction @@ -15,7 +15,7 @@ # 神器の名前 (TextComponentString) data modify storage asset:artifact Name set value '{"text":"エレキアーマー","color":"yellow"}' # 神器の説明文 (TextComponentString[]) - data modify storage asset:artifact Lore set value ['[{"text":"雷耐性+3% 雷攻撃+3%","color":"yellow"}]','[{"text":"一式揃えた場合、追加で","color":"white"}]','[{"text":"雷耐性+3% 雷攻撃+3%","color":"yellow"}]'] + data modify storage asset:artifact Lore set value [] # MP以外の消費物 (TextComponentString) (オプション) # data modify storage asset:artifact CostText set value # 使用回数 (int) (オプション) @@ -50,10 +50,14 @@ # data modify storage asset:artifact DisableCooldownMessage set value # MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション) # data modify storage asset:artifact DisableMPMessage set value +# セット装備のID (int) (オプション) + data modify storage asset:artifact EquipID set value 235 +# 装備時のステータス補正 (Component[]) (オプション) + data modify storage asset:artifact Modifiers set value [{Type:"attackThunder",Slot:"chest",Amount:0.03d,Operation:"multiply_base"},{Type:"defenseThunder",Slot:"chest",Amount:0.03d,Operation:"multiply_base"}] # 扱える神 (string[]) Wikiを参照 data modify storage asset:artifact CanUsedGod set value ["Flora", "Urban", "Nyaptov", "Wi-ki"] # カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) data modify storage asset:artifact CustomNBT set value {HideFlags:68,display:{color:16776960},Unbreakable:1b,AttributeModifiers:[{AttributeName:"generic.armor",Name:"generic.armor",Amount:6,Operation:0,UUID:[I;1,1,633,5],Slot:"chest"},{AttributeName:"generic.armor_toughness",Name:"generic.armor_toughness",Amount:0.5,Operation:0,UUID:[I;1,1,633,5],Slot:"chest"}]} # 神器の入手用function - function asset:artifact/common/give \ No newline at end of file + function asset:artifact/common/give diff --git a/Asset/data/asset/functions/artifact/0633.elec_armor/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0633.elec_armor/trigger/3.main.mcfunction index cc37451575..da2e6fb20e 100644 --- a/Asset/data/asset/functions/artifact/0633.elec_armor/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/0633.elec_armor/trigger/3.main.mcfunction @@ -9,22 +9,7 @@ # ここから先は神器側の効果の処理を書く -# 雷耐性+3% - data modify storage api: Argument.UUID set value [I;1,1,633,5] - data modify storage api: Argument.Amount set value 0.03 - data modify storage api: Argument.Operation set value "multiply_base" - function api:modifier/defense/thunder/add - -# 雷耐性+3% - data modify storage api: Argument.UUID set value [I;1,1,633,5] - data modify storage api: Argument.Amount set value 0.03 - data modify storage api: Argument.Operation set value "multiply_base" - function api:modifier/attack/thunder/add - # 演出 particle dust 1 1 0 1 ~ ~1.3 ~ 0.4 0.3 0.4 0 6 normal @a particle firework ~ ~1.3 ~ 0.4 0.3 0.4 0 6 normal @a playsound minecraft:entity.firework_rocket.twinkle player @a ~ ~ ~ 0.4 1.5 0 - -# 一式効果 - execute if data storage asset:context id.all{head:632,chest:633,legs:634,feet:635} run function asset:artifact/0633.elec_armor/trigger/4.fullset \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0633.elec_armor/trigger/5.fullset_dis_equip.mcfunction b/Asset/data/asset/functions/artifact/0633.elec_armor/trigger/5.fullset_dis_equip.mcfunction deleted file mode 100644 index 5ac351e06f..0000000000 --- a/Asset/data/asset/functions/artifact/0633.elec_armor/trigger/5.fullset_dis_equip.mcfunction +++ /dev/null @@ -1,23 +0,0 @@ -#> asset:artifact/0633.elec_armor/trigger/5.fullset_dis_equip -# -# -# -# @within function -# asset:artifact/0632.elec_helm/trigger/dis_equip/main -# asset:artifact/0633.elec_armor/trigger/dis_equip/main -# asset:artifact/0634.elec_leggings/trigger/dis_equip/main -# asset:artifact/0635.elec_boots/trigger/dis_equip/main - -# 雷耐性+3% - data modify storage api: Argument.UUID set value [I;1,1,633,0] - function api:modifier/defense/thunder/remove - -# 雷耐性+3% - data modify storage api: Argument.UUID set value [I;1,1,633,0] - function api:modifier/attack/thunder/remove - -# 演出 - playsound minecraft:entity.firework_rocket.twinkle player @a ~ ~ ~ 0.4 1.1 0 - -# Tag削除 - tag @s remove HL.Fullset \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0633.elec_armor/trigger/_index.d.mcfunction b/Asset/data/asset/functions/artifact/0633.elec_armor/trigger/_index.d.mcfunction deleted file mode 100644 index ce0f217723..0000000000 --- a/Asset/data/asset/functions/artifact/0633.elec_armor/trigger/_index.d.mcfunction +++ /dev/null @@ -1,10 +0,0 @@ -#> asset:artifact/0633.elec_armor/trigger/_index.d -# @private -# -#> Tag -# @within function -# asset:artifact/0632.elec_helm/** -# asset:artifact/0633.elec_armor/trigger/** -# asset:artifact/0634.elec_leggings/** -# asset:artifact/0635.elec_boots/** - #declare tag HL.Fullset \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0633.elec_armor/trigger/dis_equip/main.mcfunction b/Asset/data/asset/functions/artifact/0633.elec_armor/trigger/dis_equip/main.mcfunction index 6295c3cf2a..0d53f734f7 100644 --- a/Asset/data/asset/functions/artifact/0633.elec_armor/trigger/dis_equip/main.mcfunction +++ b/Asset/data/asset/functions/artifact/0633.elec_armor/trigger/dis_equip/main.mcfunction @@ -4,16 +4,5 @@ # # @within function asset:artifact/0633.elec_armor/trigger/dis_equip/ -# 雷耐性+3% - data modify storage api: Argument.UUID set value [I;1,1,633,5] - function api:modifier/defense/thunder/remove - -# 雷攻撃+3% - data modify storage api: Argument.UUID set value [I;1,1,633,5] - function api:modifier/attack/thunder/remove - # 演出 playsound minecraft:entity.firework_rocket.twinkle player @a ~ ~ ~ 0.4 1.1 0 - -# 一式効果削除 - execute if entity @s[tag=HL.Fullset] run function asset:artifact/0633.elec_armor/trigger/5.fullset_dis_equip diff --git a/Asset/data/asset/functions/artifact/0634.elec_leggings/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0634.elec_leggings/give/2.give.mcfunction index d3eb2b13f0..bc1d4ecb81 100644 --- a/Asset/data/asset/functions/artifact/0634.elec_leggings/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0634.elec_leggings/give/2.give.mcfunction @@ -15,7 +15,7 @@ # 神器の名前 (TextComponentString) data modify storage asset:artifact Name set value '{"text":"エレキレギンス","color":"yellow"}' # 神器の説明文 (TextComponentString[]) - data modify storage asset:artifact Lore set value ['{"text":"雷耐性+3% 雷攻撃+3%","color":"yellow"}'] + data modify storage asset:artifact Lore set value [] # MP以外の消費物 (TextComponentString) (オプション) # data modify storage asset:artifact CostText set value # 使用回数 (int) (オプション) @@ -50,10 +50,14 @@ # data modify storage asset:artifact DisableCooldownMessage set value # MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション) # data modify storage asset:artifact DisableMPMessage set value +# セット装備のID (int) (オプション) + data modify storage asset:artifact EquipID set value 235 +# 装備時のステータス補正 (Component[]) (オプション) + data modify storage asset:artifact Modifiers set value [{Type:"attackThunder",Slot:"legs",Amount:0.03d,Operation:"multiply_base"},{Type:"defenseThunder",Slot:"legs",Amount:0.03d,Operation:"multiply_base"}] # 扱える神 (string[]) Wikiを参照 data modify storage asset:artifact CanUsedGod set value ["Flora", "Urban", "Nyaptov", "Wi-ki"] # カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) data modify storage asset:artifact CustomNBT set value {HideFlags:68,display:{color:16776960},Unbreakable:1b,AttributeModifiers:[{AttributeName:"generic.armor",Name:"generic.armor",Amount:5,Operation:0,UUID:[I;1,1,634,4],Slot:"legs"},{AttributeName:"generic.armor_toughness",Name:"generic.armor_toughness",Amount:0.5,Operation:0,UUID:[I;1,1,634,4],Slot:"legs"}]} # 神器の入手用function - function asset:artifact/common/give \ No newline at end of file + function asset:artifact/common/give diff --git a/Asset/data/asset/functions/artifact/0634.elec_leggings/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0634.elec_leggings/trigger/3.main.mcfunction index 7724a54238..bd3eb37297 100644 --- a/Asset/data/asset/functions/artifact/0634.elec_leggings/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/0634.elec_leggings/trigger/3.main.mcfunction @@ -9,22 +9,7 @@ # ここから先は神器側の効果の処理を書く -# 雷耐性+3% - data modify storage api: Argument.UUID set value [I;1,1,634,4] - data modify storage api: Argument.Amount set value 0.03 - data modify storage api: Argument.Operation set value "multiply_base" - function api:modifier/defense/thunder/add - -# 雷耐性+3% - data modify storage api: Argument.UUID set value [I;1,1,634,4] - data modify storage api: Argument.Amount set value 0.03 - data modify storage api: Argument.Operation set value "multiply_base" - function api:modifier/attack/thunder/add - # 演出 particle dust 1 1 0 1 ~ ~0.4 ~ 0.4 0.3 0.4 0 6 normal @a particle firework ~ ~0.4 ~ 0.4 0.3 0.4 0 6 normal @a playsound minecraft:entity.firework_rocket.twinkle player @a ~ ~ ~ 0.4 1.5 0 - -# 一式効果 - execute if data storage asset:context id.all{head:632,chest:633,legs:634,feet:635} run function asset:artifact/0633.elec_armor/trigger/4.fullset \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0634.elec_leggings/trigger/dis_equip/main.mcfunction b/Asset/data/asset/functions/artifact/0634.elec_leggings/trigger/dis_equip/main.mcfunction index ee2e14c041..e42c467954 100644 --- a/Asset/data/asset/functions/artifact/0634.elec_leggings/trigger/dis_equip/main.mcfunction +++ b/Asset/data/asset/functions/artifact/0634.elec_leggings/trigger/dis_equip/main.mcfunction @@ -4,20 +4,5 @@ # # @within function asset:artifact/0634.elec_leggings/trigger/dis_equip/ -# 雷耐性+3% - data modify storage api: Argument.UUID set value [I;1,1,634,4] - data modify storage api: Argument.Amount set value 0.03 - data modify storage api: Argument.Operation set value "multiply_base" - function api:modifier/defense/thunder/remove - -# 雷攻撃+3% - data modify storage api: Argument.UUID set value [I;1,1,634,4] - data modify storage api: Argument.Amount set value 0.03 - data modify storage api: Argument.Operation set value "multiply_base" - function api:modifier/attack/thunder/remove - # 演出 playsound minecraft:entity.firework_rocket.twinkle player @a ~ ~ ~ 0.4 1.1 0 - -# 一式効果削除 - execute if entity @s[tag=HL.Fullset] run function asset:artifact/0633.elec_armor/trigger/5.fullset_dis_equip diff --git a/Asset/data/asset/functions/artifact/0635.elec_boots/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0635.elec_boots/give/2.give.mcfunction index 8dd2b7804c..136f5fe24c 100644 --- a/Asset/data/asset/functions/artifact/0635.elec_boots/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0635.elec_boots/give/2.give.mcfunction @@ -15,7 +15,7 @@ # 神器の名前 (TextComponentString) data modify storage asset:artifact Name set value '{"text":"エレキブーツ","color":"yellow"}' # 神器の説明文 (TextComponentString[]) - data modify storage asset:artifact Lore set value ['{"text":"雷耐性+3% 雷攻撃+3%","color":"yellow"}'] + data modify storage asset:artifact Lore set value [] # MP以外の消費物 (TextComponentString) (オプション) # data modify storage asset:artifact CostText set value # 使用回数 (int) (オプション) @@ -50,10 +50,14 @@ # data modify storage asset:artifact DisableCooldownMessage set value # MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション) # data modify storage asset:artifact DisableMPMessage set value +# セット装備のID (int) (オプション) + data modify storage asset:artifact EquipID set value 235 +# 装備時のステータス補正 (Component[]) (オプション) + data modify storage asset:artifact Modifiers set value [{Type:"attackThunder",Slot:"feet",Amount:0.03d,Operation:"multiply_base"},{Type:"defenseThunder",Slot:"feet",Amount:0.03d,Operation:"multiply_base"}] # 扱える神 (string[]) Wikiを参照 data modify storage asset:artifact CanUsedGod set value ["Flora", "Urban", "Nyaptov", "Wi-ki"] # カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) data modify storage asset:artifact CustomNBT set value {HideFlags:68,display:{color:16776960},Unbreakable:1b,AttributeModifiers:[{AttributeName:"generic.armor",Name:"generic.armor",Amount:2,Operation:0,UUID:[I;1,1,635,3],Slot:"feet"},{AttributeName:"generic.armor_toughness",Name:"generic.armor_toughness",Amount:0.5,Operation:0,UUID:[I;1,1,635,3],Slot:"feet"}]} # 神器の入手用function - function asset:artifact/common/give \ No newline at end of file + function asset:artifact/common/give diff --git a/Asset/data/asset/functions/artifact/0635.elec_boots/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0635.elec_boots/trigger/3.main.mcfunction index f35b4b546d..40a947ebe0 100644 --- a/Asset/data/asset/functions/artifact/0635.elec_boots/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/0635.elec_boots/trigger/3.main.mcfunction @@ -9,22 +9,7 @@ # ここから先は神器側の効果の処理を書く -# 雷耐性+3% - data modify storage api: Argument.UUID set value [I;1,1,635,3] - data modify storage api: Argument.Amount set value 0.03 - data modify storage api: Argument.Operation set value "multiply_base" - function api:modifier/defense/thunder/add - -# 雷耐性+3% - data modify storage api: Argument.UUID set value [I;1,1,635,3] - data modify storage api: Argument.Amount set value 0.03 - data modify storage api: Argument.Operation set value "multiply_base" - function api:modifier/attack/thunder/add - -#ちょっとした演出 +# 演出 particle dust 1 1 0 1 ~ ~0.3 ~ 0.4 0.1 0.4 0 6 normal @a particle firework ~ ~0.3 ~ 0.4 0.2 0.4 0 6 normal @a playsound minecraft:entity.firework_rocket.twinkle player @a ~ ~ ~ 0.4 1.5 0 - -# 一式効果 - execute if data storage asset:context id.all{head:632,chest:633,legs:634,feet:635} run function asset:artifact/0633.elec_armor/trigger/4.fullset \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0635.elec_boots/trigger/dis_equip/main.mcfunction b/Asset/data/asset/functions/artifact/0635.elec_boots/trigger/dis_equip/main.mcfunction index 17607c5a33..63e2bf85eb 100644 --- a/Asset/data/asset/functions/artifact/0635.elec_boots/trigger/dis_equip/main.mcfunction +++ b/Asset/data/asset/functions/artifact/0635.elec_boots/trigger/dis_equip/main.mcfunction @@ -4,16 +4,5 @@ # # @within function asset:artifact/0635.elec_boots/trigger/dis_equip/ -# 雷耐性+3% - data modify storage api: Argument.UUID set value [I;1,1,635,3] - function api:modifier/defense/thunder/remove - -# 雷攻撃 +3% - data modify storage api: Argument.UUID set value [I;1,1,635,3] - function api:modifier/attack/thunder/remove - # 演出 playsound minecraft:entity.firework_rocket.twinkle player @a ~ ~ ~ 0.4 1.1 0 - -# 一式効果削除 - execute if entity @s[tag=HL.Fullset] run function asset:artifact/0633.elec_armor/trigger/5.fullset_dis_equip \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0638.spirit_garment/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0638.spirit_garment/give/2.give.mcfunction index ea896756a5..22764c20bd 100644 --- a/Asset/data/asset/functions/artifact/0638.spirit_garment/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0638.spirit_garment/give/2.give.mcfunction @@ -15,7 +15,7 @@ # 神器の名前 (TextComponentString) data modify storage asset:artifact Name set value '{"text":"精霊の詩衣","color":"#B0FFD7"}' # 神器の説明文 (TextComponentString[]) - data modify storage asset:artifact Lore set value ['[{"text":"体力回復量+6% 最大体力+8","color":"light_purple"}]','[{"text":"物理耐性-5%","color":"dark_red"}]','[{"text":"精霊への詩を紡ぐ者が纏う衣。","color":"gray"}]','[{"text":"その衣を纏う者は癒しの力を得る。","color":"gray"}]'] + data modify storage asset:artifact Lore set value ['[{"text":"精霊への詩を紡ぐ者が纏う衣。","color":"gray"}]','[{"text":"その衣を纏う者は癒しの力を得る。","color":"gray"}]'] # MP以外の消費物 (TextComponentString) (オプション) # data modify storage asset:artifact CostText set value # 使用回数 (int) (オプション) @@ -50,10 +50,14 @@ # data modify storage asset:artifact DisableCooldownMessage set value # MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション) # data modify storage asset:artifact DisableMPMessage set value +# セット装備のID (int) (オプション) + # data modify storage asset:artifact EquipID set value +# 装備時のステータス補正 (Component[]) (オプション) + data modify storage asset:artifact Modifiers set value [{Type:"maxHealth",Slot:"head",Amount:8,Operation:"add"},{Type:"heal",Slot:"head",Amount:0.06d,Operation:"multiply_base"},{Type:"defensePhysical",Slot:"head",Amount:-0.05d,Operation:"multiply_base"}] # 扱える神 (string[]) Wikiを参照 data modify storage asset:artifact CanUsedGod set value ["Flora", "Nyaptov", "Wi-ki", "Rumor"] # カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) - data modify storage asset:artifact CustomNBT set value {HideFlags:68,display:{color:11599831},Unbreakable:1b,AttributeModifiers:[{AttributeName:"generic.armor",Name:"generic.armor",Amount:3.5,Operation:0,UUID:[I;1,1,638,6],Slot:"head"},{AttributeName:"generic.armor_toughness",Name:"generic.armor_toughness",Amount:1,Operation:0,UUID:[I;1,1,638,6],Slot:"head"}]} + data modify storage asset:artifact CustomNBT set value {HideFlags:196,display:{color:11599831},Trim:{material:"quartz",pattern:"tsb_armor:638"},Unbreakable:1b,AttributeModifiers:[{AttributeName:"generic.armor",Name:"generic.armor",Amount:3.5,Operation:0,UUID:[I;1,1,638,6],Slot:"head"},{AttributeName:"generic.armor_toughness",Name:"generic.armor_toughness",Amount:1,Operation:0,UUID:[I;1,1,638,6],Slot:"head"}]} # 神器の入手用function - function asset:artifact/common/give \ No newline at end of file + function asset:artifact/common/give diff --git a/Asset/data/asset/functions/artifact/0638.spirit_garment/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0638.spirit_garment/trigger/3.main.mcfunction index c3ab02419c..a592f38216 100644 --- a/Asset/data/asset/functions/artifact/0638.spirit_garment/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/0638.spirit_garment/trigger/3.main.mcfunction @@ -15,18 +15,3 @@ playsound entity.allay.ambient_without_item player @a ~ ~ ~ 1 2 playsound entity.allay.ambient_without_item player @a ~ ~ ~ 1 1.7 playsound block.amethyst_block.break player @a ~ ~ ~ 1 0.8 - -# 回復量+6% - data modify storage api: Argument.UUID set value [I;1,1,638,6] - data modify storage api: Argument.Amount set value 0.06 - data modify storage api: Argument.Operation set value "multiply_base" - function api:modifier/heal/add - -# 物理耐性-5% - data modify storage api: Argument.UUID set value [I;1,1,638,6] - data modify storage api: Argument.Amount set value -0.05 - data modify storage api: Argument.Operation set value "multiply_base" - function api:modifier/defense/physical/add - -# 最大体力+8 - attribute @s generic.max_health modifier add 00000001-0000-0001-0000-027e00000006 "MaxHealth" 8 add \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0638.spirit_garment/trigger/dis_equip/main.mcfunction b/Asset/data/asset/functions/artifact/0638.spirit_garment/trigger/dis_equip/main.mcfunction index 56614d3f63..ac6fab3306 100644 --- a/Asset/data/asset/functions/artifact/0638.spirit_garment/trigger/dis_equip/main.mcfunction +++ b/Asset/data/asset/functions/artifact/0638.spirit_garment/trigger/dis_equip/main.mcfunction @@ -7,14 +7,3 @@ # 演出 playsound minecraft:entity.allay.ambient_without_item player @a ~ ~ ~ 0.7 1.2 1 playsound minecraft:entity.allay.ambient_without_item player @a ~ ~ ~ 0.7 1.0 1 - -# 回復量 - data modify storage api: Argument.UUID set value [I;1,1,638,6] - function api:modifier/heal/remove - -# 物理耐性 - data modify storage api: Argument.UUID set value [I;1,1,638,6] - function api:modifier/defense/physical/remove - -# 最大体力+8 - attribute @s generic.max_health modifier remove 00000001-0000-0001-0000-027e00000006 \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0639.spirit_garment/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0639.spirit_garment/give/2.give.mcfunction index 31288b5dc0..b12651d4ac 100644 --- a/Asset/data/asset/functions/artifact/0639.spirit_garment/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0639.spirit_garment/give/2.give.mcfunction @@ -15,7 +15,7 @@ # 神器の名前 (TextComponentString) data modify storage asset:artifact Name set value '{"text":"精霊の詩衣","color":"#B0FFD7"}' # 神器の説明文 (TextComponentString[]) - data modify storage asset:artifact Lore set value ['[{"text":"体力回復量+6% 最大体力+8","color":"light_purple"}]','[{"text":"物理耐性-5%","color":"dark_red"}]','[{"text":"精霊への詩を紡ぐ者が纏う衣。","color":"gray"}]','[{"text":"その衣を纏う者は癒しの力を得る。","color":"gray"}]'] + data modify storage asset:artifact Lore set value ['[{"text":"精霊への詩を紡ぐ者が纏う衣。","color":"gray"}]','[{"text":"その衣を纏う者は癒しの力を得る。","color":"gray"}]'] # MP以外の消費物 (TextComponentString) (オプション) # data modify storage asset:artifact CostText set value # 使用回数 (int) (オプション) @@ -50,10 +50,14 @@ # data modify storage asset:artifact DisableCooldownMessage set value # MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション) # data modify storage asset:artifact DisableMPMessage set value +# セット装備のID (int) (オプション) + # data modify storage asset:artifact EquipID set value +# 装備時のステータス補正 (Component[]) (オプション) + data modify storage asset:artifact Modifiers set value [{Type:"maxHealth",Slot:"chest",Amount:8,Operation:"add"},{Type:"heal",Slot:"chest",Amount:0.06d,Operation:"multiply_base"},{Type:"defensePhysical",Slot:"chest",Amount:-0.05d,Operation:"multiply_base"}] # 扱える神 (string[]) Wikiを参照 data modify storage asset:artifact CanUsedGod set value ["Flora", "Nyaptov", "Wi-ki", "Rumor"] # カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) - data modify storage asset:artifact CustomNBT set value {HideFlags:68,display:{color:11599831},Unbreakable:1b,AttributeModifiers:[{AttributeName:"generic.armor",Name:"generic.armor",Amount:7,Operation:0,UUID:[I;1,1,639,5],Slot:"chest"},{AttributeName:"generic.armor_toughness",Name:"generic.armor_toughness",Amount:2,Operation:0,UUID:[I;1,1,639,5],Slot:"chest"}]} + data modify storage asset:artifact CustomNBT set value {HideFlags:196,display:{color:11599831},Trim:{material:"quartz",pattern:"tsb_armor:638"},Unbreakable:1b,AttributeModifiers:[{AttributeName:"generic.armor",Name:"generic.armor",Amount:7,Operation:0,UUID:[I;1,1,639,5],Slot:"chest"},{AttributeName:"generic.armor_toughness",Name:"generic.armor_toughness",Amount:2,Operation:0,UUID:[I;1,1,639,5],Slot:"chest"}]} # 神器の入手用function - function asset:artifact/common/give \ No newline at end of file + function asset:artifact/common/give diff --git a/Asset/data/asset/functions/artifact/0639.spirit_garment/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0639.spirit_garment/trigger/3.main.mcfunction index 30e73f6318..b4b0d712ed 100644 --- a/Asset/data/asset/functions/artifact/0639.spirit_garment/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/0639.spirit_garment/trigger/3.main.mcfunction @@ -15,18 +15,3 @@ playsound entity.allay.ambient_without_item player @a ~ ~ ~ 1 2 playsound entity.allay.ambient_without_item player @a ~ ~ ~ 1 1.7 playsound block.amethyst_block.break player @a ~ ~ ~ 1 0.8 - -# 回復量+6% - data modify storage api: Argument.UUID set value [I;1,1,639,5] - data modify storage api: Argument.Amount set value 0.06 - data modify storage api: Argument.Operation set value "multiply_base" - function api:modifier/heal/add - -# 物理耐性-5% - data modify storage api: Argument.UUID set value [I;1,1,639,5] - data modify storage api: Argument.Amount set value -0.05 - data modify storage api: Argument.Operation set value "multiply_base" - function api:modifier/defense/physical/add - -# 最大体力+8 - attribute @s generic.max_health modifier add 00000001-0000-0001-0000-027f00000005 "MaxHealth" 8 add \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0639.spirit_garment/trigger/dis_equip/main.mcfunction b/Asset/data/asset/functions/artifact/0639.spirit_garment/trigger/dis_equip/main.mcfunction index 11d5a84f3b..aa5ddac7a3 100644 --- a/Asset/data/asset/functions/artifact/0639.spirit_garment/trigger/dis_equip/main.mcfunction +++ b/Asset/data/asset/functions/artifact/0639.spirit_garment/trigger/dis_equip/main.mcfunction @@ -7,14 +7,3 @@ # 演出 playsound minecraft:entity.allay.ambient_without_item player @a ~ ~ ~ 0.7 1.2 1 playsound minecraft:entity.allay.ambient_without_item player @a ~ ~ ~ 0.7 1.0 1 - -# 回復量 - data modify storage api: Argument.UUID set value [I;1,1,639,5] - function api:modifier/heal/remove - -# 物理耐性 - data modify storage api: Argument.UUID set value [I;1,1,639,5] - function api:modifier/defense/physical/remove - -# 最大体力+8 - attribute @s generic.max_health modifier remove 00000001-0000-0001-0000-027f00000005 \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0640.spirit_garment/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0640.spirit_garment/give/2.give.mcfunction index 704b091a2c..91d30cdfe5 100644 --- a/Asset/data/asset/functions/artifact/0640.spirit_garment/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0640.spirit_garment/give/2.give.mcfunction @@ -15,7 +15,7 @@ # 神器の名前 (TextComponentString) data modify storage asset:artifact Name set value '{"text":"精霊の詩衣","color":"#B0FFD7"}' # 神器の説明文 (TextComponentString[]) - data modify storage asset:artifact Lore set value ['[{"text":"体力回復量+6% 最大体力+8","color":"light_purple"}]','[{"text":"物理耐性-5%","color":"dark_red"}]','[{"text":"精霊への詩を紡ぐ者が纏う衣。","color":"gray"}]','[{"text":"その衣を纏う者は癒しの力を得る。","color":"gray"}]'] + data modify storage asset:artifact Lore set value ['[{"text":"精霊への詩を紡ぐ者が纏う衣。","color":"gray"}]','[{"text":"その衣を纏う者は癒しの力を得る。","color":"gray"}]'] # MP以外の消費物 (TextComponentString) (オプション) # data modify storage asset:artifact CostText set value # 使用回数 (int) (オプション) @@ -50,10 +50,14 @@ # data modify storage asset:artifact DisableCooldownMessage set value # MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション) # data modify storage asset:artifact DisableMPMessage set value +# セット装備のID (int) (オプション) + # data modify storage asset:artifact EquipID set value +# 装備時のステータス補正 (Component[]) (オプション) + data modify storage asset:artifact Modifiers set value [{Type:"maxHealth",Slot:"legs",Amount:8,Operation:"add"},{Type:"heal",Slot:"legs",Amount:0.06d,Operation:"multiply_base"},{Type:"defensePhysical",Slot:"legs",Amount:-0.05d,Operation:"multiply_base"}] # 扱える神 (string[]) Wikiを参照 data modify storage asset:artifact CanUsedGod set value ["Flora", "Nyaptov", "Wi-ki", "Rumor"] # カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) - data modify storage asset:artifact CustomNBT set value {HideFlags:68,display:{color:11599831},Unbreakable:1b,AttributeModifiers:[{AttributeName:"generic.armor",Name:"generic.armor",Amount:6,Operation:0,UUID:[I;1,1,640,4],Slot:"legs"},{AttributeName:"generic.armor_toughness",Name:"generic.armor_toughness",Amount:1,Operation:0,UUID:[I;1,1,640,4],Slot:"legs"}]} + data modify storage asset:artifact CustomNBT set value {HideFlags:196,display:{color:11599831},Trim:{material:"quartz",pattern:"tsb_armor:638_leggings"},Unbreakable:1b,AttributeModifiers:[{AttributeName:"generic.armor",Name:"generic.armor",Amount:6,Operation:0,UUID:[I;1,1,640,4],Slot:"legs"},{AttributeName:"generic.armor_toughness",Name:"generic.armor_toughness",Amount:1,Operation:0,UUID:[I;1,1,640,4],Slot:"legs"}]} # 神器の入手用function - function asset:artifact/common/give \ No newline at end of file + function asset:artifact/common/give diff --git a/Asset/data/asset/functions/artifact/0640.spirit_garment/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0640.spirit_garment/trigger/3.main.mcfunction index 01caaa3d74..1100736be7 100644 --- a/Asset/data/asset/functions/artifact/0640.spirit_garment/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/0640.spirit_garment/trigger/3.main.mcfunction @@ -15,18 +15,3 @@ playsound entity.allay.ambient_without_item player @a ~ ~ ~ 1 2 playsound entity.allay.ambient_without_item player @a ~ ~ ~ 1 1.7 playsound block.amethyst_block.break player @a ~ ~ ~ 1 0.8 - -# 回復量+6% - data modify storage api: Argument.UUID set value [I;1,1,640,4] - data modify storage api: Argument.Amount set value 0.06 - data modify storage api: Argument.Operation set value "multiply_base" - function api:modifier/heal/add - -# 物理耐性-5% - data modify storage api: Argument.UUID set value [I;1,1,640,4] - data modify storage api: Argument.Amount set value -0.05 - data modify storage api: Argument.Operation set value "multiply_base" - function api:modifier/defense/physical/add - -# 最大体力+8 - attribute @s generic.max_health modifier add 00000001-0000-0001-0000-028000000004 "MaxHealth" 8 add \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0640.spirit_garment/trigger/dis_equip/main.mcfunction b/Asset/data/asset/functions/artifact/0640.spirit_garment/trigger/dis_equip/main.mcfunction index d9632cd3e0..608e06df18 100644 --- a/Asset/data/asset/functions/artifact/0640.spirit_garment/trigger/dis_equip/main.mcfunction +++ b/Asset/data/asset/functions/artifact/0640.spirit_garment/trigger/dis_equip/main.mcfunction @@ -7,14 +7,3 @@ # 演出 playsound minecraft:entity.allay.ambient_without_item player @a ~ ~ ~ 0.7 1.2 1 playsound minecraft:entity.allay.ambient_without_item player @a ~ ~ ~ 0.7 1.0 1 - -# 回復量 - data modify storage api: Argument.UUID set value [I;1,1,640,4] - function api:modifier/heal/remove - -# 物理耐性 - data modify storage api: Argument.UUID set value [I;1,1,640,4] - function api:modifier/defense/physical/remove - -# 最大体力+8 - attribute @s generic.max_health modifier remove 00000001-0000-0001-0000-028000000004 \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0641.spirit_garment/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0641.spirit_garment/give/2.give.mcfunction index 761cf1e0e9..735ded915c 100644 --- a/Asset/data/asset/functions/artifact/0641.spirit_garment/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0641.spirit_garment/give/2.give.mcfunction @@ -15,7 +15,7 @@ # 神器の名前 (TextComponentString) data modify storage asset:artifact Name set value '{"text":"精霊の詩衣","color":"#B0FFD7"}' # 神器の説明文 (TextComponentString[]) - data modify storage asset:artifact Lore set value ['[{"text":"体力回復量+6% 最大体力+8","color":"light_purple"}]','[{"text":"物理耐性-5%","color":"dark_red"}]','[{"text":"精霊への詩を紡ぐ者が纏う衣。","color":"gray"}]','[{"text":"その衣を纏う者は癒しの力を得る。","color":"gray"}]'] + data modify storage asset:artifact Lore set value ['[{"text":"精霊への詩を紡ぐ者が纏う衣。","color":"gray"}]','[{"text":"その衣を纏う者は癒しの力を得る。","color":"gray"}]'] # MP以外の消費物 (TextComponentString) (オプション) # data modify storage asset:artifact CostText set value # 使用回数 (int) (オプション) @@ -50,10 +50,14 @@ # data modify storage asset:artifact DisableCooldownMessage set value # MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション) # data modify storage asset:artifact DisableMPMessage set value +# セット装備のID (int) (オプション) + # data modify storage asset:artifact EquipID set value +# 装備時のステータス補正 (Component[]) (オプション) + data modify storage asset:artifact Modifiers set value [{Type:"maxHealth",Slot:"feet",Amount:8,Operation:"add"},{Type:"heal",Slot:"feet",Amount:0.06d,Operation:"multiply_base"},{Type:"defensePhysical",Slot:"feet",Amount:-0.05d,Operation:"multiply_base"}] # 扱える神 (string[]) Wikiを参照 data modify storage asset:artifact CanUsedGod set value ["Flora", "Nyaptov", "Wi-ki", "Rumor"] # カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) - data modify storage asset:artifact CustomNBT set value {HideFlags:68,display:{color:11599831},Unbreakable:1b,AttributeModifiers:[{AttributeName:"generic.armor",Name:"generic.armor",Amount:3.5,Operation:0,UUID:[I;1,1,61,3],Slot:"feet"},{AttributeName:"generic.armor_toughness",Name:"generic.armor_toughness",Amount:1,Operation:0,UUID:[I;1,1,61,3],Slot:"feet"}]} + data modify storage asset:artifact CustomNBT set value {HideFlags:196,display:{color:11599831},Trim:{material:"quartz",pattern:"tsb_armor:638"},Unbreakable:1b,AttributeModifiers:[{AttributeName:"generic.armor",Name:"generic.armor",Amount:3.5,Operation:0,UUID:[I;1,1,61,3],Slot:"feet"},{AttributeName:"generic.armor_toughness",Name:"generic.armor_toughness",Amount:1,Operation:0,UUID:[I;1,1,61,3],Slot:"feet"}]} # 神器の入手用function - function asset:artifact/common/give \ No newline at end of file + function asset:artifact/common/give diff --git a/Asset/data/asset/functions/artifact/0641.spirit_garment/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0641.spirit_garment/trigger/3.main.mcfunction index 89362e6576..2e8fcfcc2f 100644 --- a/Asset/data/asset/functions/artifact/0641.spirit_garment/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/0641.spirit_garment/trigger/3.main.mcfunction @@ -15,18 +15,3 @@ playsound entity.allay.ambient_without_item player @a ~ ~ ~ 1 2 playsound entity.allay.ambient_without_item player @a ~ ~ ~ 1 1.7 playsound block.amethyst_block.break player @a ~ ~ ~ 1 0.8 - -# 回復量+6% - data modify storage api: Argument.UUID set value [I;1,1,641,3] - data modify storage api: Argument.Amount set value 0.06 - data modify storage api: Argument.Operation set value "multiply_base" - function api:modifier/heal/add - -# 物理耐性-5% - data modify storage api: Argument.UUID set value [I;1,1,641,3] - data modify storage api: Argument.Amount set value -0.05 - data modify storage api: Argument.Operation set value "multiply_base" - function api:modifier/defense/physical/add - -# 最大体力+8 - attribute @s generic.max_health modifier add 00000001-0000-0001-0000-028100000003 "MaxHealth" 8 add \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0641.spirit_garment/trigger/dis_equip/main.mcfunction b/Asset/data/asset/functions/artifact/0641.spirit_garment/trigger/dis_equip/main.mcfunction index 725f515359..6c07c63586 100644 --- a/Asset/data/asset/functions/artifact/0641.spirit_garment/trigger/dis_equip/main.mcfunction +++ b/Asset/data/asset/functions/artifact/0641.spirit_garment/trigger/dis_equip/main.mcfunction @@ -7,14 +7,3 @@ # 演出 playsound minecraft:entity.allay.ambient_without_item player @a ~ ~ ~ 0.7 1.2 1 playsound minecraft:entity.allay.ambient_without_item player @a ~ ~ ~ 0.7 1.0 1 - -# 回復量 - data modify storage api: Argument.UUID set value [I;1,1,641,3] - function api:modifier/heal/remove - -# 物理耐性 - data modify storage api: Argument.UUID set value [I;1,1,641,3] - function api:modifier/defense/physical/remove - -# 最大体力+8 - attribute @s generic.max_health modifier remove 00000001-0000-0001-0000-028100000003 \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0642.raimei_helmet/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0642.raimei_helmet/give/2.give.mcfunction index f6e3d341be..352828406a 100644 --- a/Asset/data/asset/functions/artifact/0642.raimei_helmet/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0642.raimei_helmet/give/2.give.mcfunction @@ -15,7 +15,7 @@ # 神器の名前 (TextComponentString) data modify storage asset:artifact Name set value '{"text":"雷鳴","color":"yellow"}' # 神器の説明文 (TextComponentString[]) - data modify storage asset:artifact Lore set value ['{"text":"雷耐性+4%","color":"yellow"}','{"text":"セット効果で特殊な能力を得る"}'] + data modify storage asset:artifact Lore set value [] # MP以外の消費物 (TextComponentString) (オプション) # data modify storage asset:artifact CostText set value # 使用回数 (int) (オプション) @@ -23,15 +23,15 @@ # 神器を発動できるスロット (string) Wikiを参照 data modify storage asset:artifact Slot set value "head" # 神器のトリガー (string) Wikiを参照 - data modify storage asset:artifact Trigger set value "equipping" + data modify storage asset:artifact Trigger set value "onAttackByMelee" # 神器の発動条件 (TextComponentString) (オプション) # data modify storage asset:artifact Condition set value # 攻撃に関する情報 -Damage量 (literal[]/literal) Wikiを参照 (オプション) - # data modify storage asset:artifact AttackInfo.Damage set value [0,0] + data modify storage asset:artifact AttackInfo.Damage set value 40 # 攻撃に関する情報 -攻撃タイプ (string[]) Wikiを参照 (オプション) - # data modify storage asset:artifact AttackInfo.AttackType set value [Physical,Magic] + data modify storage asset:artifact AttackInfo.AttackType set value [Physical] # 攻撃に関する情報 -攻撃属性 (string[]) Wikiを参照 (オプション) - # data modify storage asset:artifact AttackInfo.ElementType set value [Fire,Water,Thunder,None] + data modify storage asset:artifact AttackInfo.ElementType set value [Thunder] # 攻撃に関する情報 -防御無視 (boolean) Wikiを参照 (オプション) # data modify storage asset:artifact AttackInfo.BypassResist set value # 攻撃に関する情報 -範囲攻撃 (string) Wikiを参照 (オプション) @@ -50,10 +50,14 @@ # data modify storage asset:artifact DisableCooldownMessage set value # MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション) # data modify storage asset:artifact DisableMPMessage set value +# セット装備のID (int) (オプション) + data modify storage asset:artifact EquipID set value 238 +# 装備時のステータス補正 (Component[]) (オプション) + data modify storage asset:artifact Modifiers set value [{Type:"defenseThunder",Slot:"head",Amount:0.04d,Operation:"multiply_base"}] # 扱える神 (string[]) Wikiを参照 data modify storage asset:artifact CanUsedGod set value ["Flora", "Urban", "Nyaptov", "Wi-ki"] # カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) - data modify storage asset:artifact CustomNBT set value {HideFlags:68,display:{color:16514938},Unbreakable:1b,AttributeModifiers:[{AttributeName:"generic.armor",Name:"generic.armor",Amount:3.5,Operation:0,UUID:[I;1,1,642,6],Slot:"head"},{AttributeName:"generic.armor_toughness",Name:"generic.armor_toughness",Amount:1,Operation:0,UUID:[I;1,1,642,6],Slot:"head"},{AttributeName:"generic.movement_speed",Name:"generic.movement_speed",Amount:0.05,Operation:1,UUID:[I;1,1,642,6],Slot:"head"}]} + data modify storage asset:artifact CustomNBT set value {HideFlags:196,display:{color:16514938},Trim:{material:"gold",pattern:"tsb_armor:642"},Unbreakable:1b,AttributeModifiers:[{AttributeName:"generic.armor",Name:"generic.armor",Amount:3.5,Operation:0,UUID:[I;1,1,642,6],Slot:"head"},{AttributeName:"generic.armor_toughness",Name:"generic.armor_toughness",Amount:1,Operation:0,UUID:[I;1,1,642,6],Slot:"head"},{AttributeName:"generic.movement_speed",Name:"generic.movement_speed",Amount:0.05,Operation:1,UUID:[I;1,1,642,6],Slot:"head"}]} # 神器の入手用function - function asset:artifact/common/give \ No newline at end of file + function asset:artifact/common/give diff --git a/Asset/data/asset/functions/artifact/0642.raimei_helmet/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0642.raimei_helmet/trigger/3.main.mcfunction index a5ab93071e..42cd26d985 100644 --- a/Asset/data/asset/functions/artifact/0642.raimei_helmet/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/0642.raimei_helmet/trigger/3.main.mcfunction @@ -11,16 +11,3 @@ # 演出 playsound minecraft:block.respawn_anchor.charge player @s ~ ~ ~ 1 2 - -# 引数の設定 - # UUID - data modify storage api: Argument.UUID set value [I;1,1,642,6] - # 補正値 - data modify storage api: Argument.Amount set value 0.04 - # 補正方法 - data modify storage api: Argument.Operation set value "multiply_base" -# 補正の追加 - function api:modifier/defense/thunder/add - -#セット効果用のファンクション実行（実行はチェストプレートの方へ） - execute if data storage asset:context id.all{head:642,chest:643,legs:644,feet:645} run function asset:artifact/0643.raimei_chestplate/trigger/3.1.armorfullset \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0642.raimei_helmet/trigger/dis_equip/.mcfunction b/Asset/data/asset/functions/artifact/0642.raimei_helmet/trigger/dis_equip/.mcfunction deleted file mode 100644 index e2db0d77d0..0000000000 --- a/Asset/data/asset/functions/artifact/0642.raimei_helmet/trigger/dis_equip/.mcfunction +++ /dev/null @@ -1,7 +0,0 @@ -#> asset:artifact/0642.raimei_helmet/trigger/dis_equip/ -# -# 装備を外した時に外した部位にのみのidが入った状態でトリガーされる -# -# @within tag/function asset:artifact/dis_equip - -execute if data storage asset:context id{head:642} run function asset:artifact/0642.raimei_helmet/trigger/dis_equip/main \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0642.raimei_helmet/trigger/dis_equip/main.mcfunction b/Asset/data/asset/functions/artifact/0642.raimei_helmet/trigger/dis_equip/main.mcfunction deleted file mode 100644 index 1c4d64449b..0000000000 --- a/Asset/data/asset/functions/artifact/0642.raimei_helmet/trigger/dis_equip/main.mcfunction +++ /dev/null @@ -1,18 +0,0 @@ -#> asset:artifact/0642.raimei_helmet/trigger/dis_equip/main -# -# 装備を外した時のメイン処理 -# -# @within function asset:artifact/0642.raimei_helmet/trigger/dis_equip/ - -#> Private -# @private - #declare tag HV.Full - -# タグを消す(チェストプレート側で実行) - execute if entity @s[tag=HV.Full] run function asset:artifact/0643.raimei_chestplate/trigger/3.3.tag_delete - -# 引数の設定 - # UUID - data modify storage api: Argument.UUID set value [I;1,1,642,6] -# 補正の削除 - function api:modifier/defense/thunder/remove \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0643.raimei_chestplate/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0643.raimei_chestplate/give/2.give.mcfunction index a8c44e54c5..8842a11f4b 100644 --- a/Asset/data/asset/functions/artifact/0643.raimei_chestplate/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0643.raimei_chestplate/give/2.give.mcfunction @@ -15,7 +15,7 @@ # 神器の名前 (TextComponentString) data modify storage asset:artifact Name set value '{"text":"雷鳴","color":"yellow"}' # 神器の説明文 (TextComponentString[]) - data modify storage asset:artifact Lore set value ['{"text":"雷耐性+4%","color":"yellow"}','{"text":"セット効果で特殊な能力を得る"}','{"text":"セット効果発動時、雷耐性+9%","color":"yellow"}'] + data modify storage asset:artifact Lore set value [] # MP以外の消費物 (TextComponentString) (オプション) # data modify storage asset:artifact CostText set value # 使用回数 (int) (オプション) @@ -23,15 +23,15 @@ # 神器を発動できるスロット (string) Wikiを参照 data modify storage asset:artifact Slot set value "chest" # 神器のトリガー (string) Wikiを参照 - data modify storage asset:artifact Trigger set value "equipping" + data modify storage asset:artifact Trigger set value "onAttackByMelee" # 神器の発動条件 (TextComponentString) (オプション) # data modify storage asset:artifact Condition set value # 攻撃に関する情報 -Damage量 (literal[]/literal) Wikiを参照 (オプション) - # data modify storage asset:artifact AttackInfo.Damage set value [0,0] + data modify storage asset:artifact AttackInfo.Damage set value 40 # 攻撃に関する情報 -攻撃タイプ (string[]) Wikiを参照 (オプション) - # data modify storage asset:artifact AttackInfo.AttackType set value [Physical,Magic] + data modify storage asset:artifact AttackInfo.AttackType set value [Physical] # 攻撃に関する情報 -攻撃属性 (string[]) Wikiを参照 (オプション) - # data modify storage asset:artifact AttackInfo.ElementType set value [Fire,Water,Thunder,None] + data modify storage asset:artifact AttackInfo.ElementType set value [Thunder] # 攻撃に関する情報 -防御無視 (boolean) Wikiを参照 (オプション) # data modify storage asset:artifact AttackInfo.BypassResist set value # 攻撃に関する情報 -範囲攻撃 (string) Wikiを参照 (オプション) @@ -50,10 +50,14 @@ # data modify storage asset:artifact DisableCooldownMessage set value # MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション) # data modify storage asset:artifact DisableMPMessage set value +# セット装備のID (int) (オプション) + data modify storage asset:artifact EquipID set value 238 +# 装備時のステータス補正 (Component[]) (オプション) + data modify storage asset:artifact Modifiers set value [{Type:"defenseThunder",Slot:"chest",Amount:0.04d,Operation:"multiply_base"}] # 扱える神 (string[]) Wikiを参照 data modify storage asset:artifact CanUsedGod set value ["Flora", "Urban", "Nyaptov", "Wi-ki"] # カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) - data modify storage asset:artifact CustomNBT set value {HideFlags:68,display:{color:16514938},Unbreakable:1b,AttributeModifiers:[{AttributeName:"generic.armor",Name:"generic.armor",Amount:7,Operation:0,UUID:[I;1,1,643,5],Slot:"chest"},{AttributeName:"generic.armor_toughness",Name:"generic.armor_toughness",Amount:2,Operation:0,UUID:[I;1,1,643,5],Slot:"chest"},{AttributeName:"generic.movement_speed",Name:"generic.movement_speed",Amount:0.05,Operation:1,UUID:[I;1,1,643,5],Slot:"chest"}]} + data modify storage asset:artifact CustomNBT set value {HideFlags:196,display:{color:16514938},Trim:{material:"netherite",pattern:"tsb_armor:642"},Unbreakable:1b,AttributeModifiers:[{AttributeName:"generic.armor",Name:"generic.armor",Amount:7,Operation:0,UUID:[I;1,1,643,5],Slot:"chest"},{AttributeName:"generic.armor_toughness",Name:"generic.armor_toughness",Amount:2,Operation:0,UUID:[I;1,1,643,5],Slot:"chest"},{AttributeName:"generic.movement_speed",Name:"generic.movement_speed",Amount:0.05,Operation:1,UUID:[I;1,1,643,5],Slot:"chest"}]} # 神器の入手用function - function asset:artifact/common/give \ No newline at end of file + function asset:artifact/common/give diff --git a/Asset/data/asset/functions/artifact/0643.raimei_chestplate/trigger/1.1.attacktrigger.mcfunction b/Asset/data/asset/functions/artifact/0643.raimei_chestplate/trigger/1.1.attacktrigger.mcfunction deleted file mode 100644 index 26c455ce3e..0000000000 --- a/Asset/data/asset/functions/artifact/0643.raimei_chestplate/trigger/1.1.attacktrigger.mcfunction +++ /dev/null @@ -1,8 +0,0 @@ -#> asset:artifact/0643.raimei_chestplate/trigger/1.1.attacktrigger -# -# 指定したイベントタイミングで実行されるfunction -# -# @within tag/function asset:artifact/** - -# storage asset:idのchestに装備している神器のIDが入っているので比較し、~/2.check_condition.mcfunctionを実行する - execute if entity @s[tag=HV.Full] run function asset:artifact/0643.raimei_chestplate/trigger/3.2.fullset_attack \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0643.raimei_chestplate/trigger/3.1.armorfullset.mcfunction b/Asset/data/asset/functions/artifact/0643.raimei_chestplate/trigger/3.1.armorfullset.mcfunction deleted file mode 100644 index 60aa22fb7c..0000000000 --- a/Asset/data/asset/functions/artifact/0643.raimei_chestplate/trigger/3.1.armorfullset.mcfunction +++ /dev/null @@ -1,36 +0,0 @@ -#> asset:artifact/0643.raimei_chestplate/trigger/3.1.armorfullset -# -# セット効果 -# -# @within function -# asset:artifact/0642.raimei_helmet/trigger/3.main -# asset:artifact/0643.raimei_chestplate/trigger/3.main -# asset:artifact/0644.raimei_leggings/trigger/3.main -# asset:artifact/0645.raimei_boots/trigger/3.main - -# 演出 - particle dust 1 1 0 1 ~ ~3 ~ 0.7 3 0.7 0 300 - particle dust 1 1 0 1 ~ ~5 ~ 0.1 5 0.1 0 300 - particle minecraft:explosion ~ ~ ~ 0.3 0 0.3 0 10 - particle minecraft:large_smoke ~ ~ ~ 0 0 0 0.4 100 - - playsound entity.lightning_bolt.thunder player @a ~ ~ ~ 1 2 - playsound entity.lightning_bolt.thunder player @a ~ ~ ~ 1 2 - playsound entity.lightning_bolt.impact player @a ~ ~ ~ 1 0 - playsound block.end_portal.spawn player @a ~ ~ ~ 1 1 - -# タグを付与する - tag @s add HV.Full - -# 耐性を強化する - # UUID(部位が不明なためanyにする) - data modify storage api: Argument.UUID set value [I;1,1,643,0] - # 補正値 - data modify storage api: Argument.Amount set value 0.09 - # 補正方法 - data modify storage api: Argument.Operation set value "multiply_base" -# 補正の追加 - function api:modifier/defense/thunder/add - -# Scheduleループ - schedule function asset:artifact/0643.raimei_chestplate/trigger/3.4.loop 1t replace \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0643.raimei_chestplate/trigger/3.2.fullset_attack.mcfunction b/Asset/data/asset/functions/artifact/0643.raimei_chestplate/trigger/3.2.fullset_attack.mcfunction deleted file mode 100644 index e5b5f428c3..0000000000 --- a/Asset/data/asset/functions/artifact/0643.raimei_chestplate/trigger/3.2.fullset_attack.mcfunction +++ /dev/null @@ -1,23 +0,0 @@ -#> asset:artifact/0643.raimei_chestplate/trigger/3.2.fullset_attack -# -# フルセット時で攻撃を与えた時 -# -# @within function asset:artifact/0643.raimei_chestplate/trigger/1.1.attacktrigger - - -# 演出 - playsound minecraft:block.respawn_anchor.deplete player @a ~ ~ ~ 1 1 - - execute at @e[type=#lib:living,type=!player,tag=Victim,distance=..10] run particle dust 0.867 0.667 0.161 1 ~ ~1 ~ 0 1 0 0 100 - -# ダメージ設定 - # 与えるダメージ = 15 - data modify storage lib: Argument.Damage set value 40.0f - # 第一属性 - data modify storage lib: Argument.AttackType set value "Physical" - data modify storage lib: Argument.ElementType set value "Thunder" - # ダメージ - function lib:damage/modifier - execute as @e[type=#lib:living,type=!player,tag=Victim,distance=..10] run function lib:damage/ -# リセット - function lib:damage/reset diff --git a/Asset/data/asset/functions/artifact/0643.raimei_chestplate/trigger/3.3.tag_delete.mcfunction b/Asset/data/asset/functions/artifact/0643.raimei_chestplate/trigger/3.3.tag_delete.mcfunction deleted file mode 100644 index b86bfdb71c..0000000000 --- a/Asset/data/asset/functions/artifact/0643.raimei_chestplate/trigger/3.3.tag_delete.mcfunction +++ /dev/null @@ -1,13 +0,0 @@ -#> asset:artifact/0643.raimei_chestplate/trigger/3.3.tag_delete -# -# フルセット効果を消す -# -# @within function asset:artifact/????.raimei_*/trigger/dis_equip/main - -# タグを消す - tag @s remove HV.Full - -# フルセット耐性を消す - data modify storage api: Argument.UUID set value [I;1,1,643,0] -# 補正の追加 - function api:modifier/defense/thunder/remove \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0643.raimei_chestplate/trigger/3.4.loop.mcfunction b/Asset/data/asset/functions/artifact/0643.raimei_chestplate/trigger/3.4.loop.mcfunction deleted file mode 100644 index 4ffb1b99a3..0000000000 --- a/Asset/data/asset/functions/artifact/0643.raimei_chestplate/trigger/3.4.loop.mcfunction +++ /dev/null @@ -1,14 +0,0 @@ -#> asset:artifact/0643.raimei_chestplate/trigger/3.4.loop -# -# ループします -# -# @within function -# asset:artifact/0643.raimei_chestplate/trigger/3.1.armorfullset -# asset:artifact/0643.raimei_chestplate/trigger/3.4.loop -# asset:artifact/0643.raimei_chestplate/trigger/rejoin_process - -# 対象へ実行 - execute as @a[tag=HV.Full] at @s run function asset:artifact/0643.raimei_chestplate/trigger/3.5.loop_effect - -# ループ - execute if entity @a[tag=HV.Full] run schedule function asset:artifact/0643.raimei_chestplate/trigger/3.4.loop 1t replace \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0643.raimei_chestplate/trigger/3.5.loop_effect.mcfunction b/Asset/data/asset/functions/artifact/0643.raimei_chestplate/trigger/3.5.loop_effect.mcfunction deleted file mode 100644 index e0f73744b0..0000000000 --- a/Asset/data/asset/functions/artifact/0643.raimei_chestplate/trigger/3.5.loop_effect.mcfunction +++ /dev/null @@ -1,13 +0,0 @@ -#> asset:artifact/0643.raimei_chestplate/trigger/3.5.loop_effect -# -# エフェクトを与える -# -# @within function asset:artifact/0643.raimei_chestplate/trigger/3.4.loop - -# 演出 - particle dust 1 1 0 1 ~ ~1 ~ 0.3 0.3 0.3 0 1 normal - -# 効果 - effect give @s jump_boost 1 1 true - effect give @s speed 1 1 true - effect give @s haste 1 0 true \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0643.raimei_chestplate/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0643.raimei_chestplate/trigger/3.main.mcfunction deleted file mode 100644 index ac3b529df9..0000000000 --- a/Asset/data/asset/functions/artifact/0643.raimei_chestplate/trigger/3.main.mcfunction +++ /dev/null @@ -1,26 +0,0 @@ -#> asset:artifact/0643.raimei_chestplate/trigger/3.main -# -# 神器のメイン処理部 -# -# @within function asset:artifact/0643.raimei_chestplate/trigger/2.check_condition - -# 基本的な使用時の処理(MP消費や使用回数の処理など)を行う - function asset:artifact/common/use/chest - -# ここから先は神器側の効果の処理を書く - -# 演出 - playsound minecraft:block.respawn_anchor.charge player @s ~ ~ ~ 1 2 - -# 引数の設定 - # UUID - data modify storage api: Argument.UUID set value [I;1,1,643,5] - # 補正値 - data modify storage api: Argument.Amount set value 0.04 - # 補正方法 - data modify storage api: Argument.Operation set value "multiply_base" -# 補正の追加 - function api:modifier/defense/thunder/add - -#セット効果用のファンクション実行（実行はチェストプレートの方へ） - execute if data storage asset:context id.all{head:642,chest:643,legs:644,feet:645} run function asset:artifact/0643.raimei_chestplate/trigger/3.1.armorfullset \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0643.raimei_chestplate/trigger/_index.d.mcfunction b/Asset/data/asset/functions/artifact/0643.raimei_chestplate/trigger/_index.d.mcfunction deleted file mode 100644 index 4bede7ce83..0000000000 --- a/Asset/data/asset/functions/artifact/0643.raimei_chestplate/trigger/_index.d.mcfunction +++ /dev/null @@ -1,7 +0,0 @@ -#> asset:artifact/0643.raimei_chestplate/trigger/_index.d -# @private - -#> tag -# @within function -# asset:artifact/0643.raimei_chestplate/trigger/** - #declare tag HV.Full \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0665.soul_fire_armor/trigger/1.trigger.mcfunction b/Asset/data/asset/functions/artifact/0643.raimei_chestplate/trigger/attack/1.trigger.mcfunction similarity index 55% rename from Asset/data/asset/functions/artifact/0665.soul_fire_armor/trigger/1.trigger.mcfunction rename to Asset/data/asset/functions/artifact/0643.raimei_chestplate/trigger/attack/1.trigger.mcfunction index 840a1a2eda..2b953a9f17 100644 --- a/Asset/data/asset/functions/artifact/0665.soul_fire_armor/trigger/1.trigger.mcfunction +++ b/Asset/data/asset/functions/artifact/0643.raimei_chestplate/trigger/attack/1.trigger.mcfunction @@ -1,8 +1,8 @@ -#> asset:artifact/0665.soul_fire_armor/trigger/1.trigger +#> asset:artifact/0643.raimei_chestplate/trigger/attack/1.trigger # # 指定したイベントタイミングで実行されるfunction # # @within tag/function asset:artifact/** # storage asset:idのchestに装備している神器のIDが入っているので比較し、~/2.check_condition.mcfunctionを実行する - execute if data storage asset:context id{chest:665} run function asset:artifact/0665.soul_fire_armor/trigger/2.check_condition \ No newline at end of file + execute if data storage asset:context id{chest:643} run function asset:artifact/0643.raimei_chestplate/trigger/attack/2.check_condition diff --git a/Asset/data/asset/functions/artifact/0643.raimei_chestplate/trigger/attack/2.check_condition.mcfunction b/Asset/data/asset/functions/artifact/0643.raimei_chestplate/trigger/attack/2.check_condition.mcfunction new file mode 100644 index 0000000000..788f2f5a0f --- /dev/null +++ b/Asset/data/asset/functions/artifact/0643.raimei_chestplate/trigger/attack/2.check_condition.mcfunction @@ -0,0 +1,17 @@ +#> asset:artifact/0643.raimei_chestplate/trigger/attack/2.check_condition +# +# 神器の発動条件をチェックします +# +# @within function asset:artifact/0643.raimei_chestplate/trigger/attack/1.trigger + +# 神器の基本的な条件の確認を行うfunction、成功している場合CanUsedタグが付く + data modify storage asset:artifact Index set value 1 + function asset:artifact/common/check_condition/chest + +# 他にアイテム等確認する場合はここに書く + data modify storage api: Argument.ID set value 238 + function api:entity/mob/effect/get/from_id + execute unless data storage api: Return.Effect{Stack:4} run tag @s remove CanUsed + +# CanUsedタグをチェックして3.main.mcfunctionを実行する + execute if entity @s[tag=CanUsed] run function asset:artifact/0643.raimei_chestplate/trigger/attack/3.main diff --git a/Asset/data/asset/functions/artifact/0643.raimei_chestplate/trigger/attack/3.main.mcfunction b/Asset/data/asset/functions/artifact/0643.raimei_chestplate/trigger/attack/3.main.mcfunction new file mode 100644 index 0000000000..034be60ed2 --- /dev/null +++ b/Asset/data/asset/functions/artifact/0643.raimei_chestplate/trigger/attack/3.main.mcfunction @@ -0,0 +1,25 @@ +#> asset:artifact/0643.raimei_chestplate/trigger/attack/3.main +# +# 神器のメイン処理部 +# +# @within function asset:artifact/0643.raimei_chestplate/trigger/attack/2.check_condition + +# 基本的な使用時の処理(MP消費や使用回数の処理など)を行う auto/feet/legs/chest/head/mainhand/offhandを記載してね + data modify storage asset:artifact Index set value 1 + function asset:artifact/common/use/chest + +# 演出 + playsound minecraft:block.respawn_anchor.deplete player @a ~ ~ ~ 1 1 + execute at @e[type=#lib:living,type=!player,tag=Victim,distance=..10] run particle dust 0.867 0.667 0.161 1 ~ ~1 ~ 0 1 0 0 100 + +# ダメージ設定 + # 与えるダメージ = 15 + data modify storage api: Argument.Damage set value 40.0f + # 第一属性 + data modify storage api: Argument.AttackType set value "Physical" + data modify storage api: Argument.ElementType set value "Thunder" + # ダメージ + function api:damage/modifier + execute as @e[type=#lib:living,type=!player,tag=Victim,distance=..10] run function api:damage/ +# リセット + function api:damage/reset diff --git a/Asset/data/asset/functions/artifact/0643.raimei_chestplate/trigger/dis_equip/.mcfunction b/Asset/data/asset/functions/artifact/0643.raimei_chestplate/trigger/dis_equip/.mcfunction deleted file mode 100644 index 5cb77f9f49..0000000000 --- a/Asset/data/asset/functions/artifact/0643.raimei_chestplate/trigger/dis_equip/.mcfunction +++ /dev/null @@ -1,7 +0,0 @@ -#> asset:artifact/0643.raimei_chestplate/trigger/dis_equip/ -# -# 装備を外した時に外した部位にのみのidが入った状態でトリガーされる -# -# @within tag/function asset:artifact/dis_equip - -execute if data storage asset:context id{chest:643} run function asset:artifact/0643.raimei_chestplate/trigger/dis_equip/main \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0643.raimei_chestplate/trigger/dis_equip/main.mcfunction b/Asset/data/asset/functions/artifact/0643.raimei_chestplate/trigger/dis_equip/main.mcfunction deleted file mode 100644 index 647f1b360a..0000000000 --- a/Asset/data/asset/functions/artifact/0643.raimei_chestplate/trigger/dis_equip/main.mcfunction +++ /dev/null @@ -1,14 +0,0 @@ -#> asset:artifact/0643.raimei_chestplate/trigger/dis_equip/main -# -# 装備を外した時のメイン処理 -# -# @within function asset:artifact/0643.raimei_chestplate/trigger/dis_equip/ - -# タグを消す(チェストプレート側で実行) - execute if entity @s[tag=HV.Full] run function asset:artifact/0643.raimei_chestplate/trigger/3.3.tag_delete - -# 引数の設定 - # UUID - data modify storage api: Argument.UUID set value [I;1,1,643,5] -# 補正の削除 - function api:modifier/defense/thunder/remove \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0643.raimei_chestplate/trigger/1.trigger.mcfunction b/Asset/data/asset/functions/artifact/0643.raimei_chestplate/trigger/equip/1.trigger.mcfunction similarity index 69% rename from Asset/data/asset/functions/artifact/0643.raimei_chestplate/trigger/1.trigger.mcfunction rename to Asset/data/asset/functions/artifact/0643.raimei_chestplate/trigger/equip/1.trigger.mcfunction index 2efae713e4..d9194108e2 100644 --- a/Asset/data/asset/functions/artifact/0643.raimei_chestplate/trigger/1.trigger.mcfunction +++ b/Asset/data/asset/functions/artifact/0643.raimei_chestplate/trigger/equip/1.trigger.mcfunction @@ -1,8 +1,8 @@ -#> asset:artifact/0643.raimei_chestplate/trigger/1.trigger +#> asset:artifact/0643.raimei_chestplate/trigger/equip/1.trigger # # 指定したイベントタイミングで実行されるfunction # # @within tag/function asset:artifact/** # storage asset:idのchestに装備している神器のIDが入っているので比較し、~/2.check_condition.mcfunctionを実行する - execute if data storage asset:context id{chest:643} run function asset:artifact/0643.raimei_chestplate/trigger/2.check_condition \ No newline at end of file + execute if data storage asset:context id{chest:643} run function asset:artifact/0643.raimei_chestplate/trigger/equip/2.check_condition diff --git a/Asset/data/asset/functions/artifact/0643.raimei_chestplate/trigger/2.check_condition.mcfunction b/Asset/data/asset/functions/artifact/0643.raimei_chestplate/trigger/equip/2.check_condition.mcfunction similarity index 77% rename from Asset/data/asset/functions/artifact/0643.raimei_chestplate/trigger/2.check_condition.mcfunction rename to Asset/data/asset/functions/artifact/0643.raimei_chestplate/trigger/equip/2.check_condition.mcfunction index b00c4c85d1..b269485f15 100644 --- a/Asset/data/asset/functions/artifact/0643.raimei_chestplate/trigger/2.check_condition.mcfunction +++ b/Asset/data/asset/functions/artifact/0643.raimei_chestplate/trigger/equip/2.check_condition.mcfunction @@ -1,12 +1,13 @@ -#> asset:artifact/0643.raimei_chestplate/trigger/2.check_condition +#> asset:artifact/0643.raimei_chestplate/trigger/equip/2.check_condition # # 神器の発動条件をチェックします # -# @within function asset:artifact/0643.raimei_chestplate/trigger/1.trigger +# @within function asset:artifact/0643.raimei_chestplate/trigger/equip/1.trigger # 神器の基本的な条件の確認を行うfunction、成功している場合CanUsedタグが付く function asset:artifact/common/check_condition/chest + # 他にアイテム等確認する場合はここに書く # CanUsedタグをチェックして3.main.mcfunctionを実行する - execute if entity @s[tag=CanUsed] run function asset:artifact/0643.raimei_chestplate/trigger/3.main \ No newline at end of file + execute if entity @s[tag=CanUsed] run function asset:artifact/0643.raimei_chestplate/trigger/equip/3.main diff --git a/Asset/data/asset/functions/artifact/0643.raimei_chestplate/trigger/equip/3.main.mcfunction b/Asset/data/asset/functions/artifact/0643.raimei_chestplate/trigger/equip/3.main.mcfunction new file mode 100644 index 0000000000..1ea4aff536 --- /dev/null +++ b/Asset/data/asset/functions/artifact/0643.raimei_chestplate/trigger/equip/3.main.mcfunction @@ -0,0 +1,13 @@ +#> asset:artifact/0643.raimei_chestplate/trigger/equip/3.main +# +# 神器のメイン処理部 +# +# @within function asset:artifact/0643.raimei_chestplate/trigger/equip/2.check_condition + +# 基本的な使用時の処理(MP消費や使用回数の処理など)を行う + function asset:artifact/common/use/chest + +# ここから先は神器側の効果の処理を書く + +# 演出 + playsound minecraft:block.respawn_anchor.charge player @s ~ ~ ~ 1 2 diff --git a/Asset/data/asset/functions/artifact/0643.raimei_chestplate/trigger/rejoin_process.mcfunction b/Asset/data/asset/functions/artifact/0643.raimei_chestplate/trigger/rejoin_process.mcfunction deleted file mode 100644 index dd3aad66a2..0000000000 --- a/Asset/data/asset/functions/artifact/0643.raimei_chestplate/trigger/rejoin_process.mcfunction +++ /dev/null @@ -1,8 +0,0 @@ -#> asset:artifact/0643.raimei_chestplate/trigger/rejoin_process -# -# 使い方は必ずwikiを見ること -# -# @within tag/function asset:rejoin - -# タグを持っていれば実行 - execute if entity @a[tag=HV.Full] run schedule function asset:artifact/0643.raimei_chestplate/trigger/3.4.loop 1t replace \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0644.raimei_leggings/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0644.raimei_leggings/give/2.give.mcfunction index e35429d21a..4686985c07 100644 --- a/Asset/data/asset/functions/artifact/0644.raimei_leggings/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0644.raimei_leggings/give/2.give.mcfunction @@ -15,7 +15,7 @@ # 神器の名前 (TextComponentString) data modify storage asset:artifact Name set value '{"text":"雷鳴","color":"yellow"}' # 神器の説明文 (TextComponentString[]) - data modify storage asset:artifact Lore set value ['{"text":"雷耐性+4%","color":"yellow"}','{"text":"セット効果で特殊な能力を得る"}'] + data modify storage asset:artifact Lore set value [] # MP以外の消費物 (TextComponentString) (オプション) # data modify storage asset:artifact CostText set value # 使用回数 (int) (オプション) @@ -23,15 +23,15 @@ # 神器を発動できるスロット (string) Wikiを参照 data modify storage asset:artifact Slot set value "legs" # 神器のトリガー (string) Wikiを参照 - data modify storage asset:artifact Trigger set value "equipping" + data modify storage asset:artifact Trigger set value "onAttackByMelee" # 神器の発動条件 (TextComponentString) (オプション) # data modify storage asset:artifact Condition set value # 攻撃に関する情報 -Damage量 (literal[]/literal) Wikiを参照 (オプション) - # data modify storage asset:artifact AttackInfo.Damage set value [0,0] + data modify storage asset:artifact AttackInfo.Damage set value 40 # 攻撃に関する情報 -攻撃タイプ (string[]) Wikiを参照 (オプション) - # data modify storage asset:artifact AttackInfo.AttackType set value [Physical,Magic] + data modify storage asset:artifact AttackInfo.AttackType set value [Physical] # 攻撃に関する情報 -攻撃属性 (string[]) Wikiを参照 (オプション) - # data modify storage asset:artifact AttackInfo.ElementType set value [Fire,Water,Thunder,None] + data modify storage asset:artifact AttackInfo.ElementType set value [Thunder] # 攻撃に関する情報 -防御無視 (boolean) Wikiを参照 (オプション) # data modify storage asset:artifact AttackInfo.BypassResist set value # 攻撃に関する情報 -範囲攻撃 (string) Wikiを参照 (オプション) @@ -50,10 +50,14 @@ # data modify storage asset:artifact DisableCooldownMessage set value # MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション) # data modify storage asset:artifact DisableMPMessage set value +# セット装備のID (int) (オプション) + data modify storage asset:artifact EquipID set value 238 +# 装備時のステータス補正 (Component[]) (オプション) + data modify storage asset:artifact Modifiers set value [{Type:"defenseThunder",Slot:"legs",Amount:0.04d,Operation:"multiply_base"}] # 扱える神 (string[]) Wikiを参照 data modify storage asset:artifact CanUsedGod set value ["Flora", "Urban", "Nyaptov", "Wi-ki"] # カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) - data modify storage asset:artifact CustomNBT set value {HideFlags:68,display:{color:16514938},Unbreakable:1b,AttributeModifiers:[{AttributeName:"generic.armor",Name:"generic.armor",Amount:6,Operation:0,UUID:[I;1,1,644,4],Slot:"legs"},{AttributeName:"generic.armor_toughness",Name:"generic.armor_toughness",Amount:1,Operation:0,UUID:[I;1,1,644,4],Slot:"legs"},{AttributeName:"generic.movement_speed",Name:"generic.movement_speed",Amount:0.05,Operation:1,UUID:[I;1,1,644,4],Slot:"legs"}]} + data modify storage asset:artifact CustomNBT set value {HideFlags:196,display:{color:16514938},Trim:{material:"netherite",pattern:"tsb_armor:642"},Unbreakable:1b,AttributeModifiers:[{AttributeName:"generic.armor",Name:"generic.armor",Amount:6,Operation:0,UUID:[I;1,1,644,4],Slot:"legs"},{AttributeName:"generic.armor_toughness",Name:"generic.armor_toughness",Amount:1,Operation:0,UUID:[I;1,1,644,4],Slot:"legs"},{AttributeName:"generic.movement_speed",Name:"generic.movement_speed",Amount:0.05,Operation:1,UUID:[I;1,1,644,4],Slot:"legs"}]} # 神器の入手用function - function asset:artifact/common/give \ No newline at end of file + function asset:artifact/common/give diff --git a/Asset/data/asset/functions/artifact/0644.raimei_leggings/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0644.raimei_leggings/trigger/3.main.mcfunction index bc4c40cfdd..2f5dda4d76 100644 --- a/Asset/data/asset/functions/artifact/0644.raimei_leggings/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/0644.raimei_leggings/trigger/3.main.mcfunction @@ -11,16 +11,3 @@ # 演出 playsound minecraft:block.respawn_anchor.charge player @s ~ ~ ~ 1 2 - -# 引数の設定 - # UUID - data modify storage api: Argument.UUID set value [I;1,1,644,4] - # 補正値 - data modify storage api: Argument.Amount set value 0.04 - # 補正方法 - data modify storage api: Argument.Operation set value "multiply_base" -# 補正の追加 - function api:modifier/defense/thunder/add - -#セット効果用のファンクション実行（実行はチェストプレートの方へ） - execute if data storage asset:context id.all{head:642,chest:643,legs:644,feet:645} run function asset:artifact/0643.raimei_chestplate/trigger/3.1.armorfullset \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0644.raimei_leggings/trigger/dis_equip/.mcfunction b/Asset/data/asset/functions/artifact/0644.raimei_leggings/trigger/dis_equip/.mcfunction deleted file mode 100644 index 071412384c..0000000000 --- a/Asset/data/asset/functions/artifact/0644.raimei_leggings/trigger/dis_equip/.mcfunction +++ /dev/null @@ -1,7 +0,0 @@ -#> asset:artifact/0644.raimei_leggings/trigger/dis_equip/ -# -# 装備を外した時に外した部位にのみのidが入った状態でトリガーされる -# -# @within tag/function asset:artifact/dis_equip - -execute if data storage asset:context id{legs:644} run function asset:artifact/0644.raimei_leggings/trigger/dis_equip/main \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0644.raimei_leggings/trigger/dis_equip/main.mcfunction b/Asset/data/asset/functions/artifact/0644.raimei_leggings/trigger/dis_equip/main.mcfunction deleted file mode 100644 index 622216d602..0000000000 --- a/Asset/data/asset/functions/artifact/0644.raimei_leggings/trigger/dis_equip/main.mcfunction +++ /dev/null @@ -1,18 +0,0 @@ -#> asset:artifact/0644.raimei_leggings/trigger/dis_equip/main -# -# 装備を外した時のメイン処理 -# -# @within function asset:artifact/0644.raimei_leggings/trigger/dis_equip/ - -#> Private -# @private - #declare tag HV.Full - -# タグを消す(チェストプレート側で実行) - execute if entity @s[tag=HV.Full] run function asset:artifact/0643.raimei_chestplate/trigger/3.3.tag_delete - -# 引数の設定 - # UUID - data modify storage api: Argument.UUID set value [I;1,1,644,4] -# 補正の削除 - function api:modifier/defense/thunder/remove \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0645.raimei_boots/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0645.raimei_boots/give/2.give.mcfunction index 4619973ac2..b5d3beafe1 100644 --- a/Asset/data/asset/functions/artifact/0645.raimei_boots/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0645.raimei_boots/give/2.give.mcfunction @@ -15,7 +15,7 @@ # 神器の名前 (TextComponentString) data modify storage asset:artifact Name set value '{"text":"雷鳴","color":"yellow"}' # 神器の説明文 (TextComponentString[]) - data modify storage asset:artifact Lore set value ['{"text":"雷耐性+4%","color":"yellow"}','{"text":"セット効果で特殊な能力を得る"}'] + data modify storage asset:artifact Lore set value [] # MP以外の消費物 (TextComponentString) (オプション) # data modify storage asset:artifact CostText set value # 使用回数 (int) (オプション) @@ -23,15 +23,15 @@ # 神器を発動できるスロット (string) Wikiを参照 data modify storage asset:artifact Slot set value "feet" # 神器のトリガー (string) Wikiを参照 - data modify storage asset:artifact Trigger set value "equipping" + data modify storage asset:artifact Trigger set value "onAttackByMelee" # 神器の発動条件 (TextComponentString) (オプション) # data modify storage asset:artifact Condition set value # 攻撃に関する情報 -Damage量 (literal[]/literal) Wikiを参照 (オプション) - # data modify storage asset:artifact AttackInfo.Damage set value [0,0] + data modify storage asset:artifact AttackInfo.Damage set value 40 # 攻撃に関する情報 -攻撃タイプ (string[]) Wikiを参照 (オプション) - # data modify storage asset:artifact AttackInfo.AttackType set value [Physical,Magic] + data modify storage asset:artifact AttackInfo.AttackType set value [Physical] # 攻撃に関する情報 -攻撃属性 (string[]) Wikiを参照 (オプション) - # data modify storage asset:artifact AttackInfo.ElementType set value [Fire,Water,Thunder,None] + data modify storage asset:artifact AttackInfo.ElementType set value [Thunder] # 攻撃に関する情報 -防御無視 (boolean) Wikiを参照 (オプション) # data modify storage asset:artifact AttackInfo.BypassResist set value # 攻撃に関する情報 -範囲攻撃 (string) Wikiを参照 (オプション) @@ -50,10 +50,14 @@ # data modify storage asset:artifact DisableCooldownMessage set value # MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション) # data modify storage asset:artifact DisableMPMessage set value +# セット装備のID (int) (オプション) + data modify storage asset:artifact EquipID set value 238 +# 装備時のステータス補正 (Component[]) (オプション) + data modify storage asset:artifact Modifiers set value [{Type:"defenseThunder",Slot:"feet",Amount:0.04d,Operation:"multiply_base"}] # 扱える神 (string[]) Wikiを参照 data modify storage asset:artifact CanUsedGod set value ["Flora", "Urban", "Nyaptov", "Wi-ki"] # カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) - data modify storage asset:artifact CustomNBT set value {HideFlags:68,display:{color:16514938},Unbreakable:1b,AttributeModifiers:[{AttributeName:"generic.armor",Name:"generic.armor",Amount:3.5,Operation:0,UUID:[I;1,1,645,3],Slot:"feet"},{AttributeName:"generic.armor_toughness",Name:"generic.armor_toughness",Amount:1,Operation:0,UUID:[I;1,1,645,3],Slot:"feet"},{AttributeName:"generic.movement_speed",Name:"generic.movement_speed",Amount:0.05,Operation:1,UUID:[I;1,1,645,3],Slot:"feet"}]} + data modify storage asset:artifact CustomNBT set value {HideFlags:196,display:{color:16514938},Trim:{material:"netherite",pattern:"tsb_armor:642"},Unbreakable:1b,AttributeModifiers:[{AttributeName:"generic.armor",Name:"generic.armor",Amount:3.5,Operation:0,UUID:[I;1,1,645,3],Slot:"feet"},{AttributeName:"generic.armor_toughness",Name:"generic.armor_toughness",Amount:1,Operation:0,UUID:[I;1,1,645,3],Slot:"feet"},{AttributeName:"generic.movement_speed",Name:"generic.movement_speed",Amount:0.05,Operation:1,UUID:[I;1,1,645,3],Slot:"feet"}]} # 神器の入手用function - function asset:artifact/common/give \ No newline at end of file + function asset:artifact/common/give diff --git a/Asset/data/asset/functions/artifact/0645.raimei_boots/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0645.raimei_boots/trigger/3.main.mcfunction index 4be8788cd3..d5a63123a1 100644 --- a/Asset/data/asset/functions/artifact/0645.raimei_boots/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/0645.raimei_boots/trigger/3.main.mcfunction @@ -11,16 +11,3 @@ # 演出 playsound minecraft:block.respawn_anchor.charge player @s ~ ~ ~ 1 2 - -# 引数の設定 - # UUID - data modify storage api: Argument.UUID set value [I;1,1,645,3] - # 補正値 - data modify storage api: Argument.Amount set value 0.04 - # 補正方法 - data modify storage api: Argument.Operation set value "multiply_base" -# 補正の追加 - function api:modifier/defense/thunder/add - -#セット効果用のファンクション実行（実行はチェストプレートの方へ） - execute if data storage asset:context id.all{head:642,chest:643,legs:644,feet:645} run function asset:artifact/0643.raimei_chestplate/trigger/3.1.armorfullset \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0645.raimei_boots/trigger/dis_equip/.mcfunction b/Asset/data/asset/functions/artifact/0645.raimei_boots/trigger/dis_equip/.mcfunction deleted file mode 100644 index e47a57f06a..0000000000 --- a/Asset/data/asset/functions/artifact/0645.raimei_boots/trigger/dis_equip/.mcfunction +++ /dev/null @@ -1,7 +0,0 @@ -#> asset:artifact/0645.raimei_boots/trigger/dis_equip/ -# -# 装備を外した時に外した部位にのみのidが入った状態でトリガーされる -# -# @within tag/function asset:artifact/dis_equip - -execute if data storage asset:context id{feet:645} run function asset:artifact/0645.raimei_boots/trigger/dis_equip/main \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0645.raimei_boots/trigger/dis_equip/main.mcfunction b/Asset/data/asset/functions/artifact/0645.raimei_boots/trigger/dis_equip/main.mcfunction deleted file mode 100644 index 72c8079984..0000000000 --- a/Asset/data/asset/functions/artifact/0645.raimei_boots/trigger/dis_equip/main.mcfunction +++ /dev/null @@ -1,18 +0,0 @@ -#> asset:artifact/0645.raimei_boots/trigger/dis_equip/main -# -# 装備を外した時のメイン処理 -# -# @within function asset:artifact/0645.raimei_boots/trigger/dis_equip/ - -#> Private -# @private - #declare tag HV.Full - -# タグを消す(チェストプレート側で実行) - execute if entity @s[tag=HV.Full] run function asset:artifact/0643.raimei_chestplate/trigger/3.3.tag_delete - -# 引数の設定 - # UUID - data modify storage api: Argument.UUID set value [I;1,1,645,3] -# 補正の削除 - function api:modifier/defense/thunder/remove \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0646.thorn_helm/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0646.thorn_helm/give/2.give.mcfunction index 9c3703ea71..b6f038584b 100644 --- a/Asset/data/asset/functions/artifact/0646.thorn_helm/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0646.thorn_helm/give/2.give.mcfunction @@ -15,7 +15,7 @@ # 神器の名前 (TextComponentString) data modify storage asset:artifact Name set value '{"text":"ソーンヘルメット","color":"#1D5923"}' # 神器の説明文 (TextComponentString[]) - data modify storage asset:artifact Lore set value ['[{"text":"水耐性+5% ","color":"aqua"},{"text":"雷耐性+5%","color":"yellow"}]','[{"text":"全てを貫くような鋭い荊で覆われた鎧。","color":"gray"}]'] + data modify storage asset:artifact Lore set value ['[{"text":"全てを貫くような鋭い荊で覆われた鎧。","color":"gray"}]'] # MP以外の消費物 (TextComponentString) (オプション) # data modify storage asset:artifact CostText set value # 使用回数 (int) (オプション) @@ -23,15 +23,15 @@ # 神器を発動できるスロット (string) Wikiを参照 data modify storage asset:artifact Slot set value "head" # 神器のトリガー (string) Wikiを参照 - data modify storage asset:artifact Trigger set value "equipping" + data modify storage asset:artifact Trigger set value "onDamageFromEntity" # 神器の発動条件 (TextComponentString) (オプション) - # data modify storage asset:artifact Condition set value"color":"#1D5923"}' + # data modify storage asset:artifact Condition set value # 攻撃に関する情報 -Damage量 (literal[]/literal) Wikiを参照 (オプション) - # data modify storage asset:artifact AttackInfo.Damage set value [0,0] + data modify storage asset:artifact AttackInfo.Damage set value 75 # 攻撃に関する情報 -攻撃タイプ (string[]) Wikiを参照 (オプション) - # data modify storage asset:artifact AttackInfo.AttackType set value [Physical,Magic] + data modify storage asset:artifact AttackInfo.AttackType set value [Physical] # 攻撃に関する情報 -攻撃属性 (string[]) Wikiを参照 (オプション) - # data modify storage asset:artifact AttackInfo.ElementType set value [Fire,Water,Thunder,None] + data modify storage asset:artifact AttackInfo.ElementType set value [None] # 攻撃に関する情報 -防御無視 (boolean) Wikiを参照 (オプション) # data modify storage asset:artifact AttackInfo.BypassResist set value # 攻撃に関する情報 -範囲攻撃 (string) Wikiを参照 (オプション) @@ -50,10 +50,14 @@ # data modify storage asset:artifact DisableCooldownMessage set value # MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション) # data modify storage asset:artifact DisableMPMessage set value +# セット装備のID (int) (オプション) + data modify storage asset:artifact EquipID set value 239 +# 装備時のステータス補正 (Component[]) (オプション) + data modify storage asset:artifact Modifiers set value [{Type:"defenseWater",Slot:"head",Amount:0.05d,Operation:"multiply_base"},{Type:"defenseThunder",Slot:"head",Amount:0.05d,Operation:"multiply_base"}] # 扱える神 (string[]) Wikiを参照 data modify storage asset:artifact CanUsedGod set value ["Flora", "Urban", "Wi-ki"] # カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) data modify storage asset:artifact CustomNBT set value {HideFlags:68,display:{color:2454317},Unbreakable:1b,AttributeModifiers:[{AttributeName:"generic.armor",Name:"generic.armor",Amount:3.5,Operation:0,UUID:[I;1,1,646,6],Slot:"head"},{AttributeName:"generic.armor_toughness",Name:"generic.armor_toughness",Amount:1,Operation:0,UUID:[I;1,1,646,6],Slot:"head"}]} # 神器の入手用function - function asset:artifact/common/give \ No newline at end of file + function asset:artifact/common/give diff --git a/Asset/data/asset/functions/artifact/0646.thorn_helm/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0646.thorn_helm/trigger/3.main.mcfunction index f21bae8976..1b1fb872e0 100644 --- a/Asset/data/asset/functions/artifact/0646.thorn_helm/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/0646.thorn_helm/trigger/3.main.mcfunction @@ -9,21 +9,6 @@ # ここから先は神器側の効果の処理を書く -# 水耐性+5% - data modify storage api: Argument.UUID set value [I;1,1,646,6] - data modify storage api: Argument.Amount set value 0.05 - data modify storage api: Argument.Operation set value "multiply_base" - function api:modifier/defense/water/add - -# 雷耐性+5% - data modify storage api: Argument.UUID set value [I;1,1,646,6] - data modify storage api: Argument.Amount set value 0.05 - data modify storage api: Argument.Operation set value "multiply_base" - function api:modifier/defense/thunder/add - # 演出 particle dust 0 0.2 0 1 ~ ~1.6 ~ 0.4 0.2 0.4 0 10 normal @a playsound minecraft:block.sweet_berry_bush.place player @a ~ ~ ~ 1 1 0 - -# フルセット - execute if data storage asset:context id.all{head:646,chest:647,legs:648,feet:649} run function asset:artifact/0647.thorn_armor/trigger/4.fullset \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0646.thorn_helm/trigger/dis_equip/.mcfunction b/Asset/data/asset/functions/artifact/0646.thorn_helm/trigger/dis_equip/.mcfunction deleted file mode 100644 index 51ce195c3f..0000000000 --- a/Asset/data/asset/functions/artifact/0646.thorn_helm/trigger/dis_equip/.mcfunction +++ /dev/null @@ -1,7 +0,0 @@ -#> asset:artifact/0646.thorn_helm/trigger/dis_equip/ -# -# 装備を外した時に外した部位にのみのidが入った状態でトリガーされる -# -# @within tag/function asset:artifact/dis_equip - -execute if data storage asset:context id{head:646} run function asset:artifact/0646.thorn_helm/trigger/dis_equip/main \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0646.thorn_helm/trigger/dis_equip/main.mcfunction b/Asset/data/asset/functions/artifact/0646.thorn_helm/trigger/dis_equip/main.mcfunction deleted file mode 100644 index 2b0d82cfe0..0000000000 --- a/Asset/data/asset/functions/artifact/0646.thorn_helm/trigger/dis_equip/main.mcfunction +++ /dev/null @@ -1,22 +0,0 @@ -#> asset:artifact/0646.thorn_helm/trigger/dis_equip/main -# -# 装備を外した時のメイン処理 -# -# @within function asset:artifact/0646.thorn_helm/trigger/dis_equip/ - -#> Private -# @private - #declare tag HZ.FullSet - -# UUID - data modify storage api: Argument.UUID set value [I;1,1,646,6] -# 補正の削除 - function api:modifier/defense/water/remove - -# UUID - data modify storage api: Argument.UUID set value [I;1,1,646,6] -# 補正の削除 - function api:modifier/defense/thunder/remove - -# フルセット解除 - execute if entity @s[tag=HZ.FullSet] run function asset:artifact/0647.thorn_armor/trigger/5.fullset_dis_equip \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0647.thorn_armor/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0647.thorn_armor/give/2.give.mcfunction index 463ccfcefd..7cbe3159b8 100644 --- a/Asset/data/asset/functions/artifact/0647.thorn_armor/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0647.thorn_armor/give/2.give.mcfunction @@ -15,7 +15,7 @@ # 神器の名前 (TextComponentString) data modify storage asset:artifact Name set value '{"text":"ソーンアーマー","color":"#1D5923"}' # 神器の説明文 (TextComponentString[]) - data modify storage asset:artifact Lore set value ['[{"text":"水耐性+5% ","color":"aqua"},{"text":"雷耐性+5%","color":"yellow"}]','[{"text":"荊の鎧を全て纒いし時、血吸いの荊が目を覚まし、","color":"#457341"}]','[{"text":"触れた者を突き刺し回復する。","color":"#457341"}]','[{"text":"全てを貫くような鋭い荊で覆われた鎧。","color":"gray"}]'] + data modify storage asset:artifact Lore set value ['[{"text":"全てを貫くような鋭い荊で覆われた鎧。","color":"gray"}]'] # MP以外の消費物 (TextComponentString) (オプション) # data modify storage asset:artifact CostText set value # 使用回数 (int) (オプション) @@ -23,15 +23,15 @@ # 神器を発動できるスロット (string) Wikiを参照 data modify storage asset:artifact Slot set value "chest" # 神器のトリガー (string) Wikiを参照 - data modify storage asset:artifact Trigger set value "equipping" + data modify storage asset:artifact Trigger set value "onDamageFromEntity" # 神器の発動条件 (TextComponentString) (オプション) # data modify storage asset:artifact Condition set value # 攻撃に関する情報 -Damage量 (literal[]/literal) Wikiを参照 (オプション) - # data modify storage asset:artifact AttackInfo.Damage set value [0,0] + data modify storage asset:artifact AttackInfo.Damage set value 75 # 攻撃に関する情報 -攻撃タイプ (string[]) Wikiを参照 (オプション) - # data modify storage asset:artifact AttackInfo.AttackType set value [Physical,Magic] + data modify storage asset:artifact AttackInfo.AttackType set value [Physical] # 攻撃に関する情報 -攻撃属性 (string[]) Wikiを参照 (オプション) - # data modify storage asset:artifact AttackInfo.ElementType set value [Fire,Water,Thunder,None] + data modify storage asset:artifact AttackInfo.ElementType set value [None] # 攻撃に関する情報 -防御無視 (boolean) Wikiを参照 (オプション) # data modify storage asset:artifact AttackInfo.BypassResist set value # 攻撃に関する情報 -範囲攻撃 (string) Wikiを参照 (オプション) @@ -50,10 +50,14 @@ # data modify storage asset:artifact DisableCooldownMessage set value # MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション) # data modify storage asset:artifact DisableMPMessage set value +# セット装備のID (int) (オプション) + data modify storage asset:artifact EquipID set value 239 +# 装備時のステータス補正 (Component[]) (オプション) + data modify storage asset:artifact Modifiers set value [{Type:"defenseWater",Slot:"chest",Amount:0.05d,Operation:"multiply_base"},{Type:"defenseThunder",Slot:"chest",Amount:0.05d,Operation:"multiply_base"}] # 扱える神 (string[]) Wikiを参照 data modify storage asset:artifact CanUsedGod set value ["Flora", "Urban", "Wi-ki"] # カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) data modify storage asset:artifact CustomNBT set value {HideFlags:68,display:{color:2454317},Unbreakable:1b,AttributeModifiers:[{AttributeName:"generic.armor",Name:"generic.armor",Amount:7,Operation:0,UUID:[I;1,1,647,5],Slot:"chest"},{AttributeName:"generic.armor_toughness",Name:"generic.armor_toughness",Amount:2,Operation:0,UUID:[I;1,1,647,5],Slot:"chest"}]} # 神器の入手用function - function asset:artifact/common/give \ No newline at end of file + function asset:artifact/common/give diff --git a/Asset/data/asset/functions/artifact/0647.thorn_armor/trigger/0.load.mcfunction b/Asset/data/asset/functions/artifact/0647.thorn_armor/trigger/0.load.mcfunction deleted file mode 100644 index 49c829426c..0000000000 --- a/Asset/data/asset/functions/artifact/0647.thorn_armor/trigger/0.load.mcfunction +++ /dev/null @@ -1,9 +0,0 @@ -#> asset:artifact/0647.thorn_armor/trigger/0.load -# -# 神器に利用するスコアボード等の初期化処理 -# -# @within tag/function asset:artifact/load - -#> 定義類はここに -# @within function asset:artifact/0647.thorn_armor/trigger/** - scoreboard objectives add HZ.CoolDown dummy \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0647.thorn_armor/trigger/10.loop_process.mcfunction b/Asset/data/asset/functions/artifact/0647.thorn_armor/trigger/10.loop_process.mcfunction deleted file mode 100644 index 19dd8f7672..0000000000 --- a/Asset/data/asset/functions/artifact/0647.thorn_armor/trigger/10.loop_process.mcfunction +++ /dev/null @@ -1,15 +0,0 @@ -#> asset:artifact/0647.thorn_armor/trigger/10.loop_process -# -# フルセット時の処理 -# -# @within function asset:artifact/0647.thorn_armor/trigger/9.loop - -# 演出 - particle dust 0 0.2 0 1 ~ ~1.3 ~ 0.8 0.4 0.8 0 2 normal @a - -# 特殊効果のクールダウン処理 - execute if entity @s[scores={HZ.CoolDown=0..}] run scoreboard players remove @s HZ.CoolDown 1 - execute if entity @s[scores={HZ.CoolDown=..0}] run scoreboard players reset @s HZ.CoolDown - -# ループ - schedule function asset:artifact/0647.thorn_armor/trigger/9.loop 1t replace \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0647.thorn_armor/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0647.thorn_armor/trigger/3.main.mcfunction deleted file mode 100644 index a6f9b50ffb..0000000000 --- a/Asset/data/asset/functions/artifact/0647.thorn_armor/trigger/3.main.mcfunction +++ /dev/null @@ -1,32 +0,0 @@ -#> asset:artifact/0647.thorn_armor/trigger/3.main -# -# 神器のメイン処理部 -# -# @within function asset:artifact/0647.thorn_armor/trigger/2.check_condition - -# 基本的な使用時の処理(MP消費や使用回数の処理など)を行う - function asset:artifact/common/use/chest - -# ここから先は神器側の効果の処理を書く - -# 本来ならここにフルセット被ダメージ時の処理を置いて置くべきだと思うけど、流石に装備だし...となっているので -# 被ダメージ時トリガーは別に使っています ダメなようならレビューしてください - -# 水耐性+5% - data modify storage api: Argument.UUID set value [I;1,1,647,5] - data modify storage api: Argument.Amount set value 0.05 - data modify storage api: Argument.Operation set value "multiply_base" - function api:modifier/defense/water/add - -# 雷耐性+5% - data modify storage api: Argument.UUID set value [I;1,1,647,5] - data modify storage api: Argument.Amount set value 0.05 - data modify storage api: Argument.Operation set value "multiply_base" - function api:modifier/defense/thunder/add - -# 演出 - particle dust 0 0.2 0 1 ~ ~1.3 ~ 0.4 0.4 0.4 0 10 normal @a - playsound minecraft:block.sweet_berry_bush.place player @a ~ ~ ~ 1 1 0 - -# フルセット - execute if data storage asset:context id.all{head:646,chest:647,legs:648,feet:649} run function asset:artifact/0647.thorn_armor/trigger/4.fullset \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0647.thorn_armor/trigger/4.fullset.mcfunction b/Asset/data/asset/functions/artifact/0647.thorn_armor/trigger/4.fullset.mcfunction deleted file mode 100644 index 9a22abe8aa..0000000000 --- a/Asset/data/asset/functions/artifact/0647.thorn_armor/trigger/4.fullset.mcfunction +++ /dev/null @@ -1,23 +0,0 @@ -#> asset:artifact/0647.thorn_armor/trigger/4.fullset -# -# フルセット時発動の処理 -# -# @within function -# asset:artifact/0646.thorn_helm/trigger/3.main -# asset:artifact/0647.thorn_armor/trigger/3.main -# asset:artifact/0648.thorn_leggings/trigger/3.main -# asset:artifact/0649.thorn_boots/trigger/3.main - -# 演出 - particle dust 0 0.2 0 1.5 ~ ~0.05 ~ 3 0 3 0 250 normal @a - particle dust 0 0.2 0 1 ~ ~1.2 ~ 0.4 0.4 0.4 0 20 normal @a - -# タグを付与 - tag @s add HZ.FullSet - -# 演出 - particle dust 0 0.2 0 1 ~ ~1.2 ~ 0.4 0.5 0.6 0 80 normal @a - playsound block.sweet_berry_bush.place player @a ~ ~ ~ 1 0 0 - -# ループスタート - schedule function asset:artifact/0647.thorn_armor/trigger/9.loop 1t replace \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0647.thorn_armor/trigger/5.fullset_dis_equip.mcfunction b/Asset/data/asset/functions/artifact/0647.thorn_armor/trigger/5.fullset_dis_equip.mcfunction deleted file mode 100644 index c448305e7b..0000000000 --- a/Asset/data/asset/functions/artifact/0647.thorn_armor/trigger/5.fullset_dis_equip.mcfunction +++ /dev/null @@ -1,13 +0,0 @@ -#> asset:artifact/0647.thorn_armor/trigger/5.fullset_dis_equip -# -# フルセット解除の処理 -# -# @within function -# asset:artifact/0646.thorn_helm/trigger/dis_equip/main -# asset:artifact/0647.thorn_armor/trigger/dis_equip/main -# asset:artifact/0648.thorn_leggings/trigger/dis_equip/main -# asset:artifact/0649.thorn_boots/trigger/dis_equip/main - -# リセット - tag @s remove HZ.FullSet - scoreboard players reset @s HZ.CoolDown \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0647.thorn_armor/trigger/6.hurt_trigger.mcfunction b/Asset/data/asset/functions/artifact/0647.thorn_armor/trigger/6.hurt_trigger.mcfunction deleted file mode 100644 index c952e19dd7..0000000000 --- a/Asset/data/asset/functions/artifact/0647.thorn_armor/trigger/6.hurt_trigger.mcfunction +++ /dev/null @@ -1,8 +0,0 @@ -#> asset:artifact/0647.thorn_armor/trigger/6.hurt_trigger -# -# 被ダメ時にTagがついているかチェック -# -# @within tag/function asset:artifact/damage/from_entity/ - -# フルセットなら実行 - execute if entity @s[tag=HZ.FullSet] unless entity @s[scores={HZ.CoolDown=0..}] run function asset:artifact/0647.thorn_armor/trigger/7.hurt \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0647.thorn_armor/trigger/7.hurt.mcfunction b/Asset/data/asset/functions/artifact/0647.thorn_armor/trigger/7.hurt.mcfunction deleted file mode 100644 index d877526084..0000000000 --- a/Asset/data/asset/functions/artifact/0647.thorn_armor/trigger/7.hurt.mcfunction +++ /dev/null @@ -1,32 +0,0 @@ -#> asset:artifact/0647.thorn_armor/trigger/7.hurt -# -# 被ダメ時の特殊効果 -# -# @within function asset:artifact/0647.thorn_armor/trigger/6.hurt_trigger - -#> Private -# @private - #declare score_holder $Fluctuation - -# クールタイム処理 - scoreboard players set @s HZ.CoolDown 20 - -# 演出 - # 相手に赤いパーティクル - execute at @e[type=#lib:living,tag=Attacker,distance=..50] run particle falling_dust redstone_block ~ ~1.2 ~ 0.5 0.5 0.5 0 20 normal @a - - # 再帰使用：相手に棘を伸ばす演出 - execute positioned ~ ~1.5 ~ facing entity @e[type=#lib:living,tag=Attacker,distance=..50] eyes run function asset:artifact/0647.thorn_armor/trigger/8.exetend_thorn - -# 被ダメージ時体力回復 - data modify storage lib: Argument.Heal set value 5.0f - function lib:heal/modifier - function lib:heal/ - function lib:heal/reset - -# 被ダメージ時攻撃者にダメージ - data modify storage lib: Argument.Damage set value 75.0f - data modify storage lib: Argument.AttackType set value "Physical" - function lib:damage/modifier - execute as @e[type=#lib:living,type=!player,tag=Attacker,distance=..50] run function lib:damage/ - function lib:damage/reset \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0647.thorn_armor/trigger/9.loop.mcfunction b/Asset/data/asset/functions/artifact/0647.thorn_armor/trigger/9.loop.mcfunction deleted file mode 100644 index 55969ca5d1..0000000000 --- a/Asset/data/asset/functions/artifact/0647.thorn_armor/trigger/9.loop.mcfunction +++ /dev/null @@ -1,11 +0,0 @@ -#> asset:artifact/0647.thorn_armor/trigger/9.loop -# -# スケジュールループを実行 -# -# @within function -# asset:artifact/0647.thorn_armor/trigger/4.fullset -# asset:artifact/0647.thorn_armor/trigger/10.loop_process -# asset:artifact/0647.thorn_armor/trigger/rejoin_process - -# 対象がいるなら実行 - execute as @a[tag=HZ.FullSet] at @s run function asset:artifact/0647.thorn_armor/trigger/10.loop_process \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0647.thorn_armor/trigger/_index.d.mcfunction b/Asset/data/asset/functions/artifact/0647.thorn_armor/trigger/_index.d.mcfunction deleted file mode 100644 index 156f62e863..0000000000 --- a/Asset/data/asset/functions/artifact/0647.thorn_armor/trigger/_index.d.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -#> asset:artifact/0647.thorn_armor/trigger/_index.d -# @private - -#> Private -# @within asset:artifact/0647.thorn_armor/trigger/** - #declare tag HZ.FullSet \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0647.thorn_armor/trigger/dis_equip/.mcfunction b/Asset/data/asset/functions/artifact/0647.thorn_armor/trigger/dis_equip/.mcfunction deleted file mode 100644 index e1a971c09a..0000000000 --- a/Asset/data/asset/functions/artifact/0647.thorn_armor/trigger/dis_equip/.mcfunction +++ /dev/null @@ -1,7 +0,0 @@ -#> asset:artifact/0647.thorn_armor/trigger/dis_equip/ -# -# 装備を外した時に外した部位にのみのidが入った状態でトリガーされる -# -# @within tag/function asset:artifact/dis_equip - -execute if data storage asset:context id{chest:647} run function asset:artifact/0647.thorn_armor/trigger/dis_equip/main \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0647.thorn_armor/trigger/dis_equip/main.mcfunction b/Asset/data/asset/functions/artifact/0647.thorn_armor/trigger/dis_equip/main.mcfunction deleted file mode 100644 index b557ab0bb3..0000000000 --- a/Asset/data/asset/functions/artifact/0647.thorn_armor/trigger/dis_equip/main.mcfunction +++ /dev/null @@ -1,18 +0,0 @@ -#> asset:artifact/0647.thorn_armor/trigger/dis_equip/main -# -# 装備を外した時のメイン処理 -# -# @within function asset:artifact/0647.thorn_armor/trigger/dis_equip/ - -# UUID - data modify storage api: Argument.UUID set value [I;1,1,647,5] -# 補正の削除 - function api:modifier/defense/water/remove - -# UUID - data modify storage api: Argument.UUID set value [I;1,1,647,5] -# 補正の削除 - function api:modifier/defense/thunder/remove - -# フルセット解除 - execute if entity @s[tag=HZ.FullSet] run function asset:artifact/0647.thorn_armor/trigger/5.fullset_dis_equip \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0563.heartland/trigger/1.trigger.mcfunction b/Asset/data/asset/functions/artifact/0647.thorn_armor/trigger/equip/1.trigger.mcfunction similarity index 56% rename from Asset/data/asset/functions/artifact/0563.heartland/trigger/1.trigger.mcfunction rename to Asset/data/asset/functions/artifact/0647.thorn_armor/trigger/equip/1.trigger.mcfunction index 7393d24f67..6048a53bf3 100644 --- a/Asset/data/asset/functions/artifact/0563.heartland/trigger/1.trigger.mcfunction +++ b/Asset/data/asset/functions/artifact/0647.thorn_armor/trigger/equip/1.trigger.mcfunction @@ -1,8 +1,8 @@ -#> asset:artifact/0563.heartland/trigger/1.trigger +#> asset:artifact/0647.thorn_armor/trigger/equip/1.trigger # # 指定したイベントタイミングで実行されるfunction # # @within tag/function asset:artifact/** # storage asset:idのchestに装備している神器のIDが入っているので比較し、~/2.check_condition.mcfunctionを実行する - execute if data storage asset:context id{chest:563} run function asset:artifact/0563.heartland/trigger/2.check_condition \ No newline at end of file + execute if data storage asset:context id{chest:647} run function asset:artifact/0647.thorn_armor/trigger/equip/2.check_condition diff --git a/Asset/data/asset/functions/artifact/0647.thorn_armor/trigger/2.check_condition.mcfunction b/Asset/data/asset/functions/artifact/0647.thorn_armor/trigger/equip/2.check_condition.mcfunction similarity index 69% rename from Asset/data/asset/functions/artifact/0647.thorn_armor/trigger/2.check_condition.mcfunction rename to Asset/data/asset/functions/artifact/0647.thorn_armor/trigger/equip/2.check_condition.mcfunction index 255924678d..e63e80a026 100644 --- a/Asset/data/asset/functions/artifact/0647.thorn_armor/trigger/2.check_condition.mcfunction +++ b/Asset/data/asset/functions/artifact/0647.thorn_armor/trigger/equip/2.check_condition.mcfunction @@ -1,12 +1,12 @@ -#> asset:artifact/0647.thorn_armor/trigger/2.check_condition +#> asset:artifact/0647.thorn_armor/trigger/equip/2.check_condition # # 神器の発動条件をチェックします # -# @within function asset:artifact/0647.thorn_armor/trigger/1.trigger +# @within function asset:artifact/0647.thorn_armor/trigger/equip/1.trigger # 神器の基本的な条件の確認を行うfunction、成功している場合CanUsedタグが付く function asset:artifact/common/check_condition/chest # 他にアイテム等確認する場合はここに書く # CanUsedタグをチェックして3.main.mcfunctionを実行する - execute if entity @s[tag=CanUsed] run function asset:artifact/0647.thorn_armor/trigger/3.main \ No newline at end of file + execute if entity @s[tag=CanUsed] run function asset:artifact/0647.thorn_armor/trigger/equip/3.main diff --git a/Asset/data/asset/functions/artifact/0647.thorn_armor/trigger/equip/3.main.mcfunction b/Asset/data/asset/functions/artifact/0647.thorn_armor/trigger/equip/3.main.mcfunction new file mode 100644 index 0000000000..4152550f72 --- /dev/null +++ b/Asset/data/asset/functions/artifact/0647.thorn_armor/trigger/equip/3.main.mcfunction @@ -0,0 +1,14 @@ +#> asset:artifact/0647.thorn_armor/trigger/equip/3.main +# +# 神器のメイン処理部 +# +# @within function asset:artifact/0647.thorn_armor/trigger/equip/2.check_condition + +# 基本的な使用時の処理(MP消費や使用回数の処理など)を行う + function asset:artifact/common/use/chest + +# ここから先は神器側の効果の処理を書く + +# 演出 + particle dust 0 0.2 0 1 ~ ~1.3 ~ 0.4 0.4 0.4 0 10 normal @a + playsound minecraft:block.sweet_berry_bush.place player @a ~ ~ ~ 1 1 0 diff --git a/Asset/data/asset/functions/artifact/0647.thorn_armor/trigger/1.trigger.mcfunction b/Asset/data/asset/functions/artifact/0647.thorn_armor/trigger/hurt/1.trigger.mcfunction similarity index 71% rename from Asset/data/asset/functions/artifact/0647.thorn_armor/trigger/1.trigger.mcfunction rename to Asset/data/asset/functions/artifact/0647.thorn_armor/trigger/hurt/1.trigger.mcfunction index d3e6524d81..dcf9dc2da8 100644 --- a/Asset/data/asset/functions/artifact/0647.thorn_armor/trigger/1.trigger.mcfunction +++ b/Asset/data/asset/functions/artifact/0647.thorn_armor/trigger/hurt/1.trigger.mcfunction @@ -1,8 +1,8 @@ -#> asset:artifact/0647.thorn_armor/trigger/1.trigger +#> asset:artifact/0647.thorn_armor/trigger/hurt/1.trigger # # 指定したイベントタイミングで実行されるfunction # # @within tag/function asset:artifact/** # storage asset:idのchestに装備している神器のIDが入っているので比較し、~/2.check_condition.mcfunctionを実行する - execute if data storage asset:context id{chest:647} run function asset:artifact/0647.thorn_armor/trigger/2.check_condition \ No newline at end of file + execute if data storage asset:context id{chest:647} run function asset:artifact/0647.thorn_armor/trigger/hurt/2.check_condition diff --git a/Asset/data/asset/functions/artifact/0563.heartland/trigger/2.check_condition.mcfunction b/Asset/data/asset/functions/artifact/0647.thorn_armor/trigger/hurt/2.check_condition.mcfunction similarity index 52% rename from Asset/data/asset/functions/artifact/0563.heartland/trigger/2.check_condition.mcfunction rename to Asset/data/asset/functions/artifact/0647.thorn_armor/trigger/hurt/2.check_condition.mcfunction index 058828f7d4..e9a6d680ae 100644 --- a/Asset/data/asset/functions/artifact/0563.heartland/trigger/2.check_condition.mcfunction +++ b/Asset/data/asset/functions/artifact/0647.thorn_armor/trigger/hurt/2.check_condition.mcfunction @@ -1,14 +1,14 @@ -#> asset:artifact/0563.heartland/trigger/2.check_condition +#> asset:artifact/0647.thorn_armor/trigger/hurt/2.check_condition # # 神器の発動条件をチェックします # -# @within function asset:artifact/0563.heartland/trigger/1.trigger +# @within function asset:artifact/0647.thorn_armor/trigger/hurt/1.trigger # 神器の基本的な条件の確認を行うfunction、成功している場合CanUsedタグが付く function asset:artifact/common/check_condition/chest # 他にアイテム等確認する場合はここに書く - # 頭(562),脚(564),足(565)がハートランドか確認 - execute unless data storage asset:context id{head:562,legs:564,feet:565} run tag @s remove CanUsed - + data modify storage api: Argument.ID set value 239 + function api:entity/mob/effect/get/from_id + execute unless data storage api: Return.Effect{Stack:4} run tag @s remove CanUsed # CanUsedタグをチェックして3.main.mcfunctionを実行する - execute if entity @s[tag=CanUsed] run function asset:artifact/0563.heartland/trigger/3.main \ No newline at end of file + execute if entity @s[tag=CanUsed] run function asset:artifact/0647.thorn_armor/trigger/hurt/3.main diff --git a/Asset/data/asset/functions/artifact/0647.thorn_armor/trigger/hurt/3.main.mcfunction b/Asset/data/asset/functions/artifact/0647.thorn_armor/trigger/hurt/3.main.mcfunction new file mode 100644 index 0000000000..957a8db6f4 --- /dev/null +++ b/Asset/data/asset/functions/artifact/0647.thorn_armor/trigger/hurt/3.main.mcfunction @@ -0,0 +1,30 @@ +#> asset:artifact/0647.thorn_armor/trigger/hurt/3.main +# +# 神器のメイン処理 +# +# @within function asset:artifact/0647.thorn_armor/trigger/hurt/2.check_condition + +# 基本的な使用時の処理(MP消費や使用回数の処理など)を行う + function asset:artifact/common/use/chest + +# ここから先は神器側の効果の処理を書く + +# 演出 + # 相手に赤いパーティクル + execute at @e[type=#lib:living,tag=Attacker,distance=..50] run particle falling_dust redstone_block ~ ~1.2 ~ 0.5 0.5 0.5 0 20 normal @a + + # 再帰使用：相手に棘を伸ばす演出 + execute positioned ~ ~1.5 ~ facing entity @e[type=#lib:living,tag=Attacker,distance=..50] eyes run function asset:artifact/0647.thorn_armor/trigger/hurt/4.extend_thorn + +# 被ダメージ時体力回復 + data modify storage api: Argument.Heal set value 5.0f + function api:heal/modifier + function api:heal/ + function api:heal/reset + +# 被ダメージ時攻撃者にダメージ + data modify storage api: Argument.Damage set value 75.0f + data modify storage api: Argument.AttackType set value "Physical" + function api:damage/modifier + execute as @e[type=#lib:living,type=!player,tag=Attacker,distance=..50] run function api:damage/ + function api:damage/reset diff --git a/Asset/data/asset/functions/artifact/0647.thorn_armor/trigger/8.exetend_thorn.mcfunction b/Asset/data/asset/functions/artifact/0647.thorn_armor/trigger/hurt/4.extend_thorn.mcfunction similarity index 66% rename from Asset/data/asset/functions/artifact/0647.thorn_armor/trigger/8.exetend_thorn.mcfunction rename to Asset/data/asset/functions/artifact/0647.thorn_armor/trigger/hurt/4.extend_thorn.mcfunction index ee772c51ce..9daaebeb4c 100644 --- a/Asset/data/asset/functions/artifact/0647.thorn_armor/trigger/8.exetend_thorn.mcfunction +++ b/Asset/data/asset/functions/artifact/0647.thorn_armor/trigger/hurt/4.extend_thorn.mcfunction @@ -1,10 +1,10 @@ -#> asset:artifact/0647.thorn_armor/trigger/8.exetend_thorn +#> asset:artifact/0647.thorn_armor/trigger/hurt/4.extend_thorn # # 棘が伸びる演出 # # @within function -# asset:artifact/0647.thorn_armor/trigger/7.hurt -# asset:artifact/0647.thorn_armor/trigger/8.exetend_thorn +# asset:artifact/0647.thorn_armor/trigger/hurt/3.main +# asset:artifact/0647.thorn_armor/trigger/hurt/4.extend_thorn # 演出 particle block oak_leaves ~ ~ ~ 0 0 0 0 1 normal @a @@ -12,4 +12,4 @@ playsound minecraft:block.sweet_berry_bush.break player @a ~ ~ ~ 0.2 1 0 # 再帰処理 - execute if entity @s[distance=..50] positioned ~-0.5 ~-0.5 ~-0.5 unless entity @e[type=#lib:living,tag=Attacker,dx=0] positioned ~0.5 ~0.5 ~0.5 positioned ^ ^ ^0.5 run function asset:artifact/0647.thorn_armor/trigger/8.exetend_thorn \ No newline at end of file + execute if entity @s[distance=..50] positioned ~-0.5 ~-0.5 ~-0.5 unless entity @e[type=#lib:living,tag=Attacker,dx=0] positioned ~0.5 ~0.5 ~0.5 positioned ^ ^ ^0.5 run function asset:artifact/0647.thorn_armor/trigger/hurt/4.extend_thorn diff --git a/Asset/data/asset/functions/artifact/0647.thorn_armor/trigger/rejoin_process.mcfunction b/Asset/data/asset/functions/artifact/0647.thorn_armor/trigger/rejoin_process.mcfunction deleted file mode 100644 index d4a91cf40d..0000000000 --- a/Asset/data/asset/functions/artifact/0647.thorn_armor/trigger/rejoin_process.mcfunction +++ /dev/null @@ -1,8 +0,0 @@ -#> asset:artifact/0647.thorn_armor/trigger/rejoin_process -# -# 使い方は必ずwikiを見ること -# -# @within tag/function asset:rejoin - -# スケジュールループのリスタート - execute if entity @a[tag=HZ.FullSet,limit=1] run schedule function asset:artifact/0647.thorn_armor/trigger/9.loop 1t replace \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0648.thorn_leggings/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0648.thorn_leggings/give/2.give.mcfunction index f9af217ad4..6427f979e8 100644 --- a/Asset/data/asset/functions/artifact/0648.thorn_leggings/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0648.thorn_leggings/give/2.give.mcfunction @@ -15,7 +15,7 @@ # 神器の名前 (TextComponentString) data modify storage asset:artifact Name set value '{"text":"ソーンレギンス","color":"#1D5923"}' # 神器の説明文 (TextComponentString[]) - data modify storage asset:artifact Lore set value ['[{"text":"水耐性+5% ","color":"aqua"},{"text":"雷耐性+5%","color":"yellow"}]','[{"text":"全てを貫くような鋭い荊で覆われた鎧。","color":"gray"}]'] + data modify storage asset:artifact Lore set value ['[{"text":"全てを貫くような鋭い荊で覆われた鎧。","color":"gray"}]'] # MP以外の消費物 (TextComponentString) (オプション) # data modify storage asset:artifact CostText set value # 使用回数 (int) (オプション) @@ -23,15 +23,15 @@ # 神器を発動できるスロット (string) Wikiを参照 data modify storage asset:artifact Slot set value "legs" # 神器のトリガー (string) Wikiを参照 - data modify storage asset:artifact Trigger set value "equipping" + data modify storage asset:artifact Trigger set value "onDamageFromEntity" # 神器の発動条件 (TextComponentString) (オプション) # data modify storage asset:artifact Condition set value # 攻撃に関する情報 -Damage量 (literal[]/literal) Wikiを参照 (オプション) - # data modify storage asset:artifact AttackInfo.Damage set value [0,0] + data modify storage asset:artifact AttackInfo.Damage set value 75 # 攻撃に関する情報 -攻撃タイプ (string[]) Wikiを参照 (オプション) - # data modify storage asset:artifact AttackInfo.AttackType set value [Physical,Magic] + data modify storage asset:artifact AttackInfo.AttackType set value [Physical] # 攻撃に関する情報 -攻撃属性 (string[]) Wikiを参照 (オプション) - # data modify storage asset:artifact AttackInfo.ElementType set value [Fire,Water,Thunder,None] + data modify storage asset:artifact AttackInfo.ElementType set value [None] # 攻撃に関する情報 -防御無視 (boolean) Wikiを参照 (オプション) # data modify storage asset:artifact AttackInfo.BypassResist set value # 攻撃に関する情報 -範囲攻撃 (string) Wikiを参照 (オプション) @@ -50,10 +50,14 @@ # data modify storage asset:artifact DisableCooldownMessage set value # MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション) # data modify storage asset:artifact DisableMPMessage set value +# セット装備のID (int) (オプション) + data modify storage asset:artifact EquipID set value 239 +# 装備時のステータス補正 (Component[]) (オプション) + data modify storage asset:artifact Modifiers set value [{Type:"defenseWater",Slot:"legs",Amount:0.05d,Operation:"multiply_base"},{Type:"defenseThunder",Slot:"legs",Amount:0.05d,Operation:"multiply_base"}] # 扱える神 (string[]) Wikiを参照 data modify storage asset:artifact CanUsedGod set value ["Flora", "Urban", "Wi-ki"] # カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) data modify storage asset:artifact CustomNBT set value {HideFlags:68,display:{color:2454317},Unbreakable:1b,AttributeModifiers:[{AttributeName:"generic.armor",Name:"generic.armor",Amount:6,Operation:0,UUID:[I;1,1,648,4],Slot:"legs"},{AttributeName:"generic.armor_toughness",Name:"generic.armor_toughness",Amount:1,Operation:0,UUID:[I;1,1,648,4],Slot:"legs"}]} # 神器の入手用function - function asset:artifact/common/give \ No newline at end of file + function asset:artifact/common/give diff --git a/Asset/data/asset/functions/artifact/0648.thorn_leggings/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0648.thorn_leggings/trigger/3.main.mcfunction index 3920b9af5f..700f22bf3e 100644 --- a/Asset/data/asset/functions/artifact/0648.thorn_leggings/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/0648.thorn_leggings/trigger/3.main.mcfunction @@ -9,21 +9,6 @@ # ここから先は神器側の効果の処理を書く -# 水耐性+5% - data modify storage api: Argument.UUID set value [I;1,1,648,4] - data modify storage api: Argument.Amount set value 0.05 - data modify storage api: Argument.Operation set value "multiply_base" - function api:modifier/defense/water/add - -# 雷耐性+5% - data modify storage api: Argument.UUID set value [I;1,1,648,4] - data modify storage api: Argument.Amount set value 0.05 - data modify storage api: Argument.Operation set value "multiply_base" - function api:modifier/defense/thunder/add - # 演出 particle dust 0 0.2 0 1 ~ ~0.4 ~ 0.4 0.3 0.4 0 10 normal @a playsound minecraft:block.sweet_berry_bush.place player @a ~ ~ ~ 1 1 0 - -# フルセット - execute if data storage asset:context id.all{head:646,chest:647,legs:648,feet:649} run function asset:artifact/0647.thorn_armor/trigger/4.fullset \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0648.thorn_leggings/trigger/dis_equip/.mcfunction b/Asset/data/asset/functions/artifact/0648.thorn_leggings/trigger/dis_equip/.mcfunction deleted file mode 100644 index b701426f8f..0000000000 --- a/Asset/data/asset/functions/artifact/0648.thorn_leggings/trigger/dis_equip/.mcfunction +++ /dev/null @@ -1,7 +0,0 @@ -#> asset:artifact/0648.thorn_leggings/trigger/dis_equip/ -# -# 装備を外した時に外した部位にのみのidが入った状態でトリガーされる -# -# @within tag/function asset:artifact/dis_equip - -execute if data storage asset:context id{legs:648} run function asset:artifact/0648.thorn_leggings/trigger/dis_equip/main \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0648.thorn_leggings/trigger/dis_equip/main.mcfunction b/Asset/data/asset/functions/artifact/0648.thorn_leggings/trigger/dis_equip/main.mcfunction deleted file mode 100644 index d5d8cd6507..0000000000 --- a/Asset/data/asset/functions/artifact/0648.thorn_leggings/trigger/dis_equip/main.mcfunction +++ /dev/null @@ -1,22 +0,0 @@ -#> asset:artifact/0648.thorn_leggings/trigger/dis_equip/main -# -# 装備を外した時のメイン処理 -# -# @within function asset:artifact/0648.thorn_leggings/trigger/dis_equip/ - -#> Private -# @private - #declare tag HZ.FullSet - -# UUID - data modify storage api: Argument.UUID set value [I;1,1,648,4] -# 補正の削除 - function api:modifier/defense/water/remove - -# UUID - data modify storage api: Argument.UUID set value [I;1,1,648,4] -# 補正の削除 - function api:modifier/defense/thunder/remove - -# フルセット解除 - execute if entity @s[tag=HZ.FullSet] run function asset:artifact/0647.thorn_armor/trigger/5.fullset_dis_equip \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0649.thorn_boots/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0649.thorn_boots/give/2.give.mcfunction index b935834689..c319f4f7f4 100644 --- a/Asset/data/asset/functions/artifact/0649.thorn_boots/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0649.thorn_boots/give/2.give.mcfunction @@ -15,7 +15,7 @@ # 神器の名前 (TextComponentString) data modify storage asset:artifact Name set value '{"text":"ソーンブーツ","color":"#1D5923"}' # 神器の説明文 (TextComponentString[]) - data modify storage asset:artifact Lore set value ['[{"text":"水耐性+5% ","color":"aqua"},{"text":"雷耐性+5%","color":"yellow"}]','[{"text":"全てを貫くような鋭い荊で覆われた鎧。","color":"gray"}]'] + data modify storage asset:artifact Lore set value ['[{"text":"全てを貫くような鋭い荊で覆われた鎧。","color":"gray"}]'] # MP以外の消費物 (TextComponentString) (オプション) # data modify storage asset:artifact CostText set value # 使用回数 (int) (オプション) @@ -23,15 +23,15 @@ # 神器を発動できるスロット (string) Wikiを参照 data modify storage asset:artifact Slot set value "feet" # 神器のトリガー (string) Wikiを参照 - data modify storage asset:artifact Trigger set value "equipping" + data modify storage asset:artifact Trigger set value "onDamageFromEntity" # 神器の発動条件 (TextComponentString) (オプション) # data modify storage asset:artifact Condition set value # 攻撃に関する情報 -Damage量 (literal[]/literal) Wikiを参照 (オプション) - # data modify storage asset:artifact AttackInfo.Damage set value [0,0] + data modify storage asset:artifact AttackInfo.Damage set value 75 # 攻撃に関する情報 -攻撃タイプ (string[]) Wikiを参照 (オプション) - # data modify storage asset:artifact AttackInfo.AttackType set value [Physical,Magic] + data modify storage asset:artifact AttackInfo.AttackType set value [Physical] # 攻撃に関する情報 -攻撃属性 (string[]) Wikiを参照 (オプション) - # data modify storage asset:artifact AttackInfo.ElementType set value [Fire,Water,Thunder,None] + data modify storage asset:artifact AttackInfo.ElementType set value [None] # 攻撃に関する情報 -防御無視 (boolean) Wikiを参照 (オプション) # data modify storage asset:artifact AttackInfo.BypassResist set value # 攻撃に関する情報 -範囲攻撃 (string) Wikiを参照 (オプション) @@ -50,10 +50,14 @@ # data modify storage asset:artifact DisableCooldownMessage set value # MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション) # data modify storage asset:artifact DisableMPMessage set value +# セット装備のID (int) (オプション) + data modify storage asset:artifact EquipID set value 239 +# 装備時のステータス補正 (Component[]) (オプション) + data modify storage asset:artifact Modifiers set value [{Type:"defenseWater",Slot:"feet",Amount:0.05d,Operation:"multiply_base"},{Type:"defenseThunder",Slot:"feet",Amount:0.05d,Operation:"multiply_base"}] # 扱える神 (string[]) Wikiを参照 data modify storage asset:artifact CanUsedGod set value ["Flora", "Urban", "Wi-ki"] # カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) data modify storage asset:artifact CustomNBT set value {HideFlags:68,display:{color:2454317},Unbreakable:1b,AttributeModifiers:[{AttributeName:"generic.armor",Name:"generic.armor",Amount:3.5,Operation:0,UUID:[I;1,1,649,3],Slot:"feet"},{AttributeName:"generic.armor_toughness",Name:"generic.armor_toughness",Amount:1,Operation:0,UUID:[I;1,1,649,3],Slot:"feet"}]} # 神器の入手用function - function asset:artifact/common/give \ No newline at end of file + function asset:artifact/common/give diff --git a/Asset/data/asset/functions/artifact/0649.thorn_boots/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0649.thorn_boots/trigger/3.main.mcfunction index 3577c86ffe..1bb6156e90 100644 --- a/Asset/data/asset/functions/artifact/0649.thorn_boots/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/0649.thorn_boots/trigger/3.main.mcfunction @@ -9,21 +9,6 @@ # ここから先は神器側の効果の処理を書く -# 水耐性+5% - data modify storage api: Argument.UUID set value [I;1,1,649,3] - data modify storage api: Argument.Amount set value 0.05 - data modify storage api: Argument.Operation set value "multiply_base" - function api:modifier/defense/water/add - -# 雷耐性+5% - data modify storage api: Argument.UUID set value [I;1,1,649,3] - data modify storage api: Argument.Amount set value 0.05 - data modify storage api: Argument.Operation set value "multiply_base" - function api:modifier/defense/thunder/add - # 演出 particle dust 0 0.2 0 1 ~ ~0.3 ~ 0.4 0.2 0.4 0 10 normal @a playsound minecraft:block.sweet_berry_bush.place player @a ~ ~ ~ 1 1 0 - -# フルセット - execute if data storage asset:context id.all{head:646,chest:647,legs:648,feet:649} run function asset:artifact/0647.thorn_armor/trigger/4.fullset \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0649.thorn_boots/trigger/dis_equip/.mcfunction b/Asset/data/asset/functions/artifact/0649.thorn_boots/trigger/dis_equip/.mcfunction deleted file mode 100644 index 1e33f30fc9..0000000000 --- a/Asset/data/asset/functions/artifact/0649.thorn_boots/trigger/dis_equip/.mcfunction +++ /dev/null @@ -1,7 +0,0 @@ -#> asset:artifact/0649.thorn_boots/trigger/dis_equip/ -# -# 装備を外した時に外した部位にのみのidが入った状態でトリガーされる -# -# @within tag/function asset:artifact/dis_equip - -execute if data storage asset:context id{feet:649} run function asset:artifact/0649.thorn_boots/trigger/dis_equip/main \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0649.thorn_boots/trigger/dis_equip/main.mcfunction b/Asset/data/asset/functions/artifact/0649.thorn_boots/trigger/dis_equip/main.mcfunction deleted file mode 100644 index 5ea0917504..0000000000 --- a/Asset/data/asset/functions/artifact/0649.thorn_boots/trigger/dis_equip/main.mcfunction +++ /dev/null @@ -1,22 +0,0 @@ -#> asset:artifact/0649.thorn_boots/trigger/dis_equip/main -# -# 装備を外した時のメイン処理 -# -# @within function asset:artifact/0649.thorn_boots/trigger/dis_equip/ - -#> Private -# @private - #declare tag HZ.FullSet - -# UUID - data modify storage api: Argument.UUID set value [I;1,1,649,3] -# 補正の削除 - function api:modifier/defense/water/remove - -# UUID - data modify storage api: Argument.UUID set value [I;1,1,649,3] -# 補正の削除 - function api:modifier/defense/thunder/remove - -# フルセット解除 - execute if entity @s[tag=HZ.FullSet] run function asset:artifact/0647.thorn_armor/trigger/5.fullset_dis_equip \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0664.soul_fire_armor/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0664.soul_fire_armor/give/2.give.mcfunction index bf785aa22b..5e1ec8a138 100644 --- a/Asset/data/asset/functions/artifact/0664.soul_fire_armor/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0664.soul_fire_armor/give/2.give.mcfunction @@ -15,7 +15,7 @@ # 神器の名前 (TextComponentString) data modify storage asset:artifact Name set value '{"text":"魂炎纏","color":"#01A7AC","bold":true}' # 神器の説明文 (TextComponentString[]) - data modify storage asset:artifact Lore set value ['[{"text":"物理攻撃+5% ","color":"dark_green"},{"text":"火耐性+10% 火攻撃+10% ","color":"red"}]','[{"text":"MP回復量+8% ","color":"green"},{"text":"最大体力-10%","color":"dark_red"}]','{"text":"魂炎を纏う者に代償を。","color":"#017C80","italic":true}','{"text":"代償背負いし者へ力を。","color":"#017C80","italic":true}'] + data modify storage asset:artifact Lore set value ['{"text":"魂炎を纏う者に代償を。","color":"#017C80","italic":true}','{"text":"代償背負いし者へ力を。","color":"#017C80","italic":true}'] # MP以外の消費物 (TextComponentString) (オプション) # data modify storage asset:artifact CostText set value # 使用回数 (int) (オプション) @@ -23,19 +23,19 @@ # 神器を発動できるスロット (string) Wikiを参照 data modify storage asset:artifact Slot set value "head" # 神器のトリガー (string) Wikiを参照 - data modify storage asset:artifact Trigger set value "equipping" + data modify storage asset:artifact Trigger set value "onAttack" # 神器の発動条件 (TextComponentString) (オプション) # data modify storage asset:artifact Condition set value # 攻撃に関する情報 -Damage量 (literal[]/literal) Wikiを参照 (オプション) - # data modify storage asset:artifact AttackInfo.Damage set value [0,0] + data modify storage asset:artifact AttackInfo.Damage set value 80 # 攻撃に関する情報 -攻撃タイプ (string[]) Wikiを参照 (オプション) - # data modify storage asset:artifact AttackInfo.AttackType set value [Physical,Magic] + data modify storage asset:artifact AttackInfo.AttackType set value [Physical] # 攻撃に関する情報 -攻撃属性 (string[]) Wikiを参照 (オプション) - # data modify storage asset:artifact AttackInfo.ElementType set value [Fire,Water,Thunder,None] + data modify storage asset:artifact AttackInfo.ElementType set value [Fire] # 攻撃に関する情報 -防御無視 (boolean) Wikiを参照 (オプション) # data modify storage asset:artifact AttackInfo.BypassResist set value # 攻撃に関する情報 -範囲攻撃 (string) Wikiを参照 (オプション) - # data modify storage asset:artifact AttackInfo.IsRangeAttack set value + data modify storage asset:artifact AttackInfo.IsRangeAttack set value "never" # 攻撃に関する情報 -攻撃範囲 (literal) Wikiを参照 (オプション) # data modify storage asset:artifact AttackInfo.AttackRange set value # MP消費量 (int) @@ -50,10 +50,14 @@ # data modify storage asset:artifact DisableCooldownMessage set value # MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション) # data modify storage asset:artifact DisableMPMessage set value +# セット装備のID (int) (オプション) + data modify storage asset:artifact EquipID set value 232 +# 装備時のステータス補正 (Component[]) (オプション) + data modify storage asset:artifact Modifiers set value [{Type:"maxHealth",Slot:"head",Amount:-0.10d,Operation:"multiply_base"},{Type:"attackPhysical",Slot:"head",Amount:0.05d,Operation:"multiply_base"},{Type:"attackFire",Slot:"head",Amount:0.10d,Operation:"multiply_base"},{Type:"defenseFire",Slot:"head",Amount:0.10d,Operation:"multiply_base"},{Type:"mpRegen",Slot:"head",Amount:0.08d,Operation:"multiply_base"}] # 扱える神 (string[]) Wikiを参照 data modify storage asset:artifact CanUsedGod set value ["Urban", "Nyaptov", "Rumor"] # カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) - data modify storage asset:artifact CustomNBT set value {HideFlags:68,display:{color:3071974},Unbreakable:1b,AttributeModifiers:[{AttributeName:"generic.armor",Name:"generic.armor",Amount:5,Operation:0,UUID:[I;1,1,664,6],Slot:"head"},{AttributeName:"generic.armor_toughness",Name:"generic.armor_toughness",Amount:2.5,Operation:0,UUID:[I;1,1,664,6],Slot:"head"}]} + data modify storage asset:artifact CustomNBT set value {HideFlags:196,display:{color:3071974},Trim:{material:"diamond",pattern:"tsb_armor:664"},Unbreakable:1b,AttributeModifiers:[{AttributeName:"generic.armor",Name:"generic.armor",Amount:5,Operation:0,UUID:[I;1,1,664,6],Slot:"head"},{AttributeName:"generic.armor_toughness",Name:"generic.armor_toughness",Amount:2.5,Operation:0,UUID:[I;1,1,664,6],Slot:"head"}]} # 神器の入手用function function asset:artifact/common/give diff --git a/Asset/data/asset/functions/artifact/0664.soul_fire_armor/trigger/0.load.mcfunction b/Asset/data/asset/functions/artifact/0664.soul_fire_armor/trigger/0.load.mcfunction deleted file mode 100644 index 11e042a6f8..0000000000 --- a/Asset/data/asset/functions/artifact/0664.soul_fire_armor/trigger/0.load.mcfunction +++ /dev/null @@ -1,9 +0,0 @@ -#> asset:artifact/0664.soul_fire_armor/trigger/0.load -# -# 神器に利用するスコアボード等の初期化処理 -# -# @within tag/function asset:artifact/load - -#> 定義類はここに -# @within function asset:artifact/0664.soul_fire_armor/trigger/fullset/** - scoreboard objectives add IG.AttackCT dummy \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0664.soul_fire_armor/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0664.soul_fire_armor/trigger/3.main.mcfunction deleted file mode 100644 index 14626ce881..0000000000 --- a/Asset/data/asset/functions/artifact/0664.soul_fire_armor/trigger/3.main.mcfunction +++ /dev/null @@ -1,50 +0,0 @@ -#> asset:artifact/0664.soul_fire_armor/trigger/3.main -# -# 神器のメイン処理部 -# -# @within function asset:artifact/0664.soul_fire_armor/trigger/2.check_condition - -# 基本的な使用時の処理(MP消費や使用回数の処理など)を行う - function asset:artifact/common/use/head - -# ここから先は神器側の効果の処理を書く - -# 演出 - execute unless data storage asset:context id.all{head:664,chest:665,legs:666,feet:667} positioned ~ ~1.7 ~ facing entity @s eyes rotated ~ 0 run function asset:artifact/0664.soul_fire_armor/trigger/particle - playsound block.fire.ambient player @a ~ ~ ~ 1.5 0.8 0 - playsound particle.soul_escape player @a ~ ~ ~ 2 0 0 - playsound minecraft:block.sculk_sensor.clicking player @a ~ ~ ~ 0.8 0 - playsound ogg:mob.vex.idle1 player @a ~ ~ ~ 1 0 0 - -# 物理攻撃+5% - data modify storage api: Argument.UUID set value [I;1,1,664,6] - data modify storage api: Argument.Amount set value 0.05 - data modify storage api: Argument.Operation set value "multiply_base" - function api:modifier/attack/physical/add - -# 火耐性+10% - data modify storage api: Argument.UUID set value [I;1,1,664,6] - data modify storage api: Argument.Amount set value 0.1 - data modify storage api: Argument.Operation set value "multiply_base" - function api:modifier/defense/fire/add - -# 火攻撃+10% - data modify storage api: Argument.UUID set value [I;1,1,664,6] - data modify storage api: Argument.Amount set value 0.1 - data modify storage api: Argument.Operation set value "multiply_base" - function api:modifier/attack/fire/add - -# MP回復量+8% - data modify storage api: Argument.UUID set value [I;1,1,664,6] - data modify storage api: Argument.Amount set value 0.08 - data modify storage api: Argument.Operation set value "multiply_base" - function api:modifier/mp_regen/add - -# 最大体力-10% - attribute @s generic.max_health modifier add 00000001-0000-0001-0000-029800000006 "MaxHealthDown" -0.1 multiply_base - -# 最大体力を反映するための即時回復 - effect give @s instant_health 1 0 - -# フルセット検知 - execute if data storage asset:context id.all{head:664,chest:665,legs:666,feet:667} run function asset:artifact/0664.soul_fire_armor/trigger/fullset/ \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0664.soul_fire_armor/trigger/_index.d.mcfunction b/Asset/data/asset/functions/artifact/0664.soul_fire_armor/trigger/_index.d.mcfunction deleted file mode 100644 index eca77c6092..0000000000 --- a/Asset/data/asset/functions/artifact/0664.soul_fire_armor/trigger/_index.d.mcfunction +++ /dev/null @@ -1,12 +0,0 @@ -#> asset:artifact/0664.soul_fire_armor/trigger/_index.d -# @private - -#> フルセットTag -# @within function -# asset:artifact/0664.soul_fire_armor/trigger/** -# asset:artifact/0664.soul_fire_armor/trigger/fullset/** -# asset:artifact/0664.soul_fire_armor/trigger/dis_equip/main -# asset:artifact/0665.soul_fire_armor/trigger/dis_equip/main -# asset:artifact/0666.soul_fire_armor/trigger/dis_equip/main -# asset:artifact/0667.soul_fire_armor/trigger/dis_equip/main - #declare tag IG.Fullset \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0664.soul_fire_armor/trigger/attack/1.trigger.mcfunction b/Asset/data/asset/functions/artifact/0664.soul_fire_armor/trigger/attack/1.trigger.mcfunction new file mode 100644 index 0000000000..324321a743 --- /dev/null +++ b/Asset/data/asset/functions/artifact/0664.soul_fire_armor/trigger/attack/1.trigger.mcfunction @@ -0,0 +1,8 @@ +#> asset:artifact/0664.soul_fire_armor/trigger/attack/1.trigger +# +# 指定したイベントタイミングで実行されるfunction +# +# @within tag/function asset:artifact/** + +# storage asset:idのheadに装備している神器のIDが入っているので比較し、~/2.check_condition.mcfunctionを実行する + execute if data storage asset:context id{head:664} run function asset:artifact/0664.soul_fire_armor/trigger/attack/2.check_condition diff --git a/Asset/data/asset/functions/artifact/0664.soul_fire_armor/trigger/attack/2.check_condition.mcfunction b/Asset/data/asset/functions/artifact/0664.soul_fire_armor/trigger/attack/2.check_condition.mcfunction new file mode 100644 index 0000000000..0578335939 --- /dev/null +++ b/Asset/data/asset/functions/artifact/0664.soul_fire_armor/trigger/attack/2.check_condition.mcfunction @@ -0,0 +1,18 @@ +#> asset:artifact/0664.soul_fire_armor/trigger/attack/2.check_condition +# +# 神器の発動条件をチェックします +# +# @within function asset:artifact/0664.soul_fire_armor/trigger/attack/1.trigger + +# 神器の基本的な条件の確認を行うfunction、成功している場合CanUsedタグが付く + data modify storage asset:artifact Index set value 1 + function asset:artifact/common/check_condition/head +# 他にアイテム等確認する場合はここに書く + +# フルセットかどうか確認する + data modify storage api: Argument.ID set value 232 + function api:entity/mob/effect/get/from_id + execute unless data storage api: Return.Effect{Stack:4} run tag @s remove CanUsed + +# CanUsedタグをチェックして3.main.mcfunctionを実行する + execute if entity @s[tag=CanUsed] run function asset:artifact/0664.soul_fire_armor/trigger/attack/3.main diff --git a/Asset/data/asset/functions/artifact/0664.soul_fire_armor/trigger/attack/3.main.mcfunction b/Asset/data/asset/functions/artifact/0664.soul_fire_armor/trigger/attack/3.main.mcfunction new file mode 100644 index 0000000000..7ca42888f8 --- /dev/null +++ b/Asset/data/asset/functions/artifact/0664.soul_fire_armor/trigger/attack/3.main.mcfunction @@ -0,0 +1,26 @@ +#> asset:artifact/0664.soul_fire_armor/trigger/attack/3.main +# +# フルセット時の近接攻撃 +# +# @within function asset:artifact/0664.soul_fire_armor/trigger/attack/2.check_condition + +# 基本的な使用時の処理(MP消費や使用回数の処理など)を行う + data modify storage asset:artifact Index set value 1 + function asset:artifact/common/use/head + +# 演出 + execute as @e[type=#lib:living,type=!player,tag=Victim,distance=..64] at @s run function asset:artifact/0664.soul_fire_armor/trigger/attack/4.particle + execute at @e[type=#lib:living,type=!player,tag=Victim,distance=..64] run playsound block.fire.ambient player @a ~ ~ ~ 2 0.8 0 + execute at @e[type=#lib:living,type=!player,tag=Victim,distance=..64] run playsound particle.soul_escape player @a ~ ~ ~ 2 0 0 + execute at @e[type=#lib:living,type=!player,tag=Victim,distance=..64] run playsound minecraft:block.sculk_sensor.clicking player @a ~ ~ ~ 0.6 0.4 0 + +# ダメージ + data modify storage api: Argument.Damage set value 80.0f + data modify storage api: Argument.AttackType set value "Physical" + data modify storage api: Argument.ElementType set value "Fire" + data modify storage api: Argument.DamageType set value "Projectile" + function api:damage/modifier + execute as @e[type=#lib:living,type=!player,tag=Victim,distance=..64] run function api:damage/ + +# リセット + function api:damage/reset diff --git a/Asset/data/asset/functions/artifact/0664.soul_fire_armor/trigger/fullset/particle.mcfunction b/Asset/data/asset/functions/artifact/0664.soul_fire_armor/trigger/attack/4.particle.mcfunction similarity index 99% rename from Asset/data/asset/functions/artifact/0664.soul_fire_armor/trigger/fullset/particle.mcfunction rename to Asset/data/asset/functions/artifact/0664.soul_fire_armor/trigger/attack/4.particle.mcfunction index c9d9dfa3da..937b7d6a22 100644 --- a/Asset/data/asset/functions/artifact/0664.soul_fire_armor/trigger/fullset/particle.mcfunction +++ b/Asset/data/asset/functions/artifact/0664.soul_fire_armor/trigger/attack/4.particle.mcfunction @@ -1,10 +1,5 @@ -#> asset:artifact/0664.soul_fire_armor/trigger/fullset/particle -# -# フルセットした瞬間の演出 -# -# @within function -# asset:artifact/0664.soul_fire_armor/trigger/fullset/ -# asset:artifact/0664.soul_fire_armor/trigger/fullset/attack +#> asset:artifact/0664.soul_fire_armor/trigger/attack/4.particle +# @within function asset:artifact/0664.soul_fire_armor/trigger/attack/3.main # 1つ目の円 execute rotated ~0 0 positioned ^ ^0.2 ^0.8 facing entity @s feet rotated ~ ~-5 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000001 0 normal @a @@ -298,4 +293,4 @@ execute rotated ~340 0 positioned ^ ^0 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a execute rotated ~345 0 positioned ^ ^0 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a execute rotated ~350 0 positioned ^ ^0 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a - execute rotated ~355 0 positioned ^ ^0 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a \ No newline at end of file + execute rotated ~355 0 positioned ^ ^0 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a diff --git a/Asset/data/asset/functions/artifact/0664.soul_fire_armor/trigger/dis_equip/main.mcfunction b/Asset/data/asset/functions/artifact/0664.soul_fire_armor/trigger/dis_equip/main.mcfunction index f054c08d6b..84f1f3ba1e 100644 --- a/Asset/data/asset/functions/artifact/0664.soul_fire_armor/trigger/dis_equip/main.mcfunction +++ b/Asset/data/asset/functions/artifact/0664.soul_fire_armor/trigger/dis_equip/main.mcfunction @@ -4,30 +4,12 @@ # # @within function asset:artifact/0664.soul_fire_armor/trigger/dis_equip/ +# 装備部位数を取得 + data modify storage api: Argument.ID set value 232 + function api:entity/mob/effect/get/from_id + # 演出 - execute if entity @s[tag=!IG.Fullset] positioned ~ ~1.7 ~ run function asset:artifact/0664.soul_fire_armor/trigger/particle2 + execute unless data storage api: Return.Effect{Stack:4} positioned ~ ~1.7 ~ run function asset:artifact/0664.soul_fire_armor/trigger/dis_equip/particle playsound block.fire.ambient player @a ~ ~ ~ 1.5 0.8 0 playsound particle.soul_escape player @a ~ ~ ~ 2 0 0 playsound ogg:mob.vex.idle1 player @a ~ ~ ~ 1 0 0 - -# 物理攻撃 - data modify storage api: Argument.UUID set value [I;1,1,664,6] - function api:modifier/attack/physical/remove - -# 火耐性 - data modify storage api: Argument.UUID set value [I;1,1,664,6] - function api:modifier/defense/fire/remove - -# 火攻撃 - data modify storage api: Argument.UUID set value [I;1,1,664,6] - function api:modifier/attack/fire/remove - -# MP回復量 - data modify storage api: Argument.UUID set value [I;1,1,664,6] - function api:modifier/mp_regen/remove - -# 最大体力 - attribute @s generic.max_health modifier remove 00000001-0000-0001-0000-029800000006 - -# フルセット解除 - execute if entity @s[tag=IG.Fullset] run function asset:artifact/0664.soul_fire_armor/trigger/fullset/fullset_dis_equip \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0664.soul_fire_armor/trigger/particle2.mcfunction b/Asset/data/asset/functions/artifact/0664.soul_fire_armor/trigger/dis_equip/particle.mcfunction similarity index 87% rename from Asset/data/asset/functions/artifact/0664.soul_fire_armor/trigger/particle2.mcfunction rename to Asset/data/asset/functions/artifact/0664.soul_fire_armor/trigger/dis_equip/particle.mcfunction index 45e2540f52..cfba5013bd 100644 --- a/Asset/data/asset/functions/artifact/0664.soul_fire_armor/trigger/particle2.mcfunction +++ b/Asset/data/asset/functions/artifact/0664.soul_fire_armor/trigger/dis_equip/particle.mcfunction @@ -1,13 +1,5 @@ -#> asset:artifact/0664.soul_fire_armor/trigger/particle2 -# -# -# -# @within function -# asset:artifact/0664.soul_fire_armor/trigger/dis_equip/main -# asset:artifact/0665.soul_fire_armor/trigger/dis_equip/main -# asset:artifact/0666.soul_fire_armor/trigger/dis_equip/main -# asset:artifact/0667.soul_fire_armor/trigger/dis_equip/main -# asset:artifact/0664.soul_fire_armor/trigger/fullset/fullset_dis_equip +#> asset:artifact/0664.soul_fire_armor/trigger/dis_equip/particle +# @within function asset:artifact/066*.soul_fire_armor/trigger/dis_equip/main # 拡散するパーティクル execute rotated ~00 0 run particle soul ~ ~ ~ ^ ^ ^100000000 0.0000000005 0 @@ -46,4 +38,4 @@ execute rotated ~280 0 run particle soul_fire_flame ~ ~ ~ ^ ^ ^100000000 0.00000000075 0 execute rotated ~300 0 run particle soul_fire_flame ~ ~ ~ ^ ^ ^100000000 0.00000000075 0 execute rotated ~320 0 run particle soul_fire_flame ~ ~ ~ ^ ^ ^100000000 0.00000000075 0 - execute rotated ~340 0 run particle soul_fire_flame ~ ~ ~ ^ ^ ^100000000 0.00000000075 0 \ No newline at end of file + execute rotated ~340 0 run particle soul_fire_flame ~ ~ ~ ^ ^ ^100000000 0.00000000075 0 diff --git a/Asset/data/asset/functions/artifact/0664.soul_fire_armor/trigger/1.trigger.mcfunction b/Asset/data/asset/functions/artifact/0664.soul_fire_armor/trigger/equip/1.trigger.mcfunction similarity index 70% rename from Asset/data/asset/functions/artifact/0664.soul_fire_armor/trigger/1.trigger.mcfunction rename to Asset/data/asset/functions/artifact/0664.soul_fire_armor/trigger/equip/1.trigger.mcfunction index c8b7102c25..77fbff712f 100644 --- a/Asset/data/asset/functions/artifact/0664.soul_fire_armor/trigger/1.trigger.mcfunction +++ b/Asset/data/asset/functions/artifact/0664.soul_fire_armor/trigger/equip/1.trigger.mcfunction @@ -1,8 +1,8 @@ -#> asset:artifact/0664.soul_fire_armor/trigger/1.trigger +#> asset:artifact/0664.soul_fire_armor/trigger/equip/1.trigger # # 指定したイベントタイミングで実行されるfunction # # @within tag/function asset:artifact/** # storage asset:idのheadに装備している神器のIDが入っているので比較し、~/2.check_condition.mcfunctionを実行する - execute if data storage asset:context id{head:664} run function asset:artifact/0664.soul_fire_armor/trigger/2.check_condition \ No newline at end of file + execute if data storage asset:context id{head:664} run function asset:artifact/0664.soul_fire_armor/trigger/equip/2.check_condition diff --git a/Asset/data/asset/functions/artifact/0664.soul_fire_armor/trigger/2.check_condition.mcfunction b/Asset/data/asset/functions/artifact/0664.soul_fire_armor/trigger/equip/2.check_condition.mcfunction similarity index 60% rename from Asset/data/asset/functions/artifact/0664.soul_fire_armor/trigger/2.check_condition.mcfunction rename to Asset/data/asset/functions/artifact/0664.soul_fire_armor/trigger/equip/2.check_condition.mcfunction index 97ba9c4059..c2475a345d 100644 --- a/Asset/data/asset/functions/artifact/0664.soul_fire_armor/trigger/2.check_condition.mcfunction +++ b/Asset/data/asset/functions/artifact/0664.soul_fire_armor/trigger/equip/2.check_condition.mcfunction @@ -1,12 +1,13 @@ -#> asset:artifact/0664.soul_fire_armor/trigger/2.check_condition +#> asset:artifact/0664.soul_fire_armor/trigger/equip/2.check_condition # # 神器の発動条件をチェックします # -# @within function asset:artifact/0664.soul_fire_armor/trigger/1.trigger +# @within function asset:artifact/0664.soul_fire_armor/trigger/equip/1.trigger # 神器の基本的な条件の確認を行うfunction、成功している場合CanUsedタグが付く + data modify storage asset:artifact IgnoreCondition set value ["localcd"] function asset:artifact/common/check_condition/head # 他にアイテム等確認する場合はここに書く - + # CanUsedタグをチェックして3.main.mcfunctionを実行する - execute if entity @s[tag=CanUsed] run function asset:artifact/0664.soul_fire_armor/trigger/3.main \ No newline at end of file + execute if entity @s[tag=CanUsed] run function asset:artifact/0664.soul_fire_armor/trigger/equip/3.main diff --git a/Asset/data/asset/functions/artifact/0664.soul_fire_armor/trigger/equip/3.main.mcfunction b/Asset/data/asset/functions/artifact/0664.soul_fire_armor/trigger/equip/3.main.mcfunction new file mode 100644 index 0000000000..5104060736 --- /dev/null +++ b/Asset/data/asset/functions/artifact/0664.soul_fire_armor/trigger/equip/3.main.mcfunction @@ -0,0 +1,16 @@ +#> asset:artifact/0664.soul_fire_armor/trigger/equip/3.main +# +# 装備時の処理部 +# +# @within function asset:artifact/0664.soul_fire_armor/trigger/equip/2.check_condition + +# 装備部位数を取得 + data modify storage api: Argument.ID set value 232 + function api:entity/mob/effect/get/from_id + +# 演出 + execute unless data storage api: Return.Effect{Stack:4} positioned ~ ~1.7 ~ run function asset:artifact/0664.soul_fire_armor/trigger/equip/4.particle + playsound block.fire.ambient player @a ~ ~ ~ 1.5 0.8 0 + playsound particle.soul_escape player @a ~ ~ ~ 2 0 0 + playsound minecraft:block.sculk_sensor.clicking player @a ~ ~ ~ 0.8 0 + playsound ogg:mob.vex.idle1 player @a ~ ~ ~ 1 0 0 diff --git a/Asset/data/asset/functions/artifact/0664.soul_fire_armor/trigger/particle.mcfunction b/Asset/data/asset/functions/artifact/0664.soul_fire_armor/trigger/equip/4.particle.mcfunction similarity index 94% rename from Asset/data/asset/functions/artifact/0664.soul_fire_armor/trigger/particle.mcfunction rename to Asset/data/asset/functions/artifact/0664.soul_fire_armor/trigger/equip/4.particle.mcfunction index 5cf1dc1216..043cf025b0 100644 --- a/Asset/data/asset/functions/artifact/0664.soul_fire_armor/trigger/particle.mcfunction +++ b/Asset/data/asset/functions/artifact/0664.soul_fire_armor/trigger/equip/4.particle.mcfunction @@ -1,12 +1,5 @@ -#> asset:artifact/0664.soul_fire_armor/trigger/particle -# -# -# -# @within function -# asset:artifact/0664.soul_fire_armor/trigger/3.main -# asset:artifact/0665.soul_fire_armor/trigger/3.main -# asset:artifact/0666.soul_fire_armor/trigger/3.main -# asset:artifact/0667.soul_fire_armor/trigger/3.main +#> asset:artifact/0664.soul_fire_armor/trigger/equip/4.particle +# @within function asset:artifact/066*.soul_fire_armor/trigger/equip/3.main # 収束するパーティクル execute rotated ~00 0 positioned ^ ^ ^1 facing entity @s eyes rotated ~ 0 run particle soul ~ ~ ~ ^ ^ ^100000000 0.0000000005 0 @@ -45,4 +38,4 @@ execute rotated ~280 0 positioned ^ ^ ^1.5 facing entity @s eyes rotated ~ 0 run particle soul_fire_flame ~ ~ ~ ^ ^ ^100000000 0.00000000075 0 execute rotated ~300 0 positioned ^ ^ ^1.5 facing entity @s eyes rotated ~ 0 run particle soul_fire_flame ~ ~ ~ ^ ^ ^100000000 0.00000000075 0 execute rotated ~320 0 positioned ^ ^ ^1.5 facing entity @s eyes rotated ~ 0 run particle soul_fire_flame ~ ~ ~ ^ ^ ^100000000 0.00000000075 0 - execute rotated ~340 0 positioned ^ ^ ^1.5 facing entity @s eyes rotated ~ 0 run particle soul_fire_flame ~ ~ ~ ^ ^ ^100000000 0.00000000075 0 \ No newline at end of file + execute rotated ~340 0 positioned ^ ^ ^1.5 facing entity @s eyes rotated ~ 0 run particle soul_fire_flame ~ ~ ~ ^ ^ ^100000000 0.00000000075 0 diff --git a/Asset/data/asset/functions/artifact/0664.soul_fire_armor/trigger/fullset/.mcfunction b/Asset/data/asset/functions/artifact/0664.soul_fire_armor/trigger/fullset/.mcfunction deleted file mode 100644 index b641cf65cd..0000000000 --- a/Asset/data/asset/functions/artifact/0664.soul_fire_armor/trigger/fullset/.mcfunction +++ /dev/null @@ -1,41 +0,0 @@ -#> asset:artifact/0664.soul_fire_armor/trigger/fullset/ -# -# 全て装備したときの効果 -# -# @within function -# asset:artifact/0664.soul_fire_armor/trigger/3.main -# asset:artifact/0665.soul_fire_armor/trigger/3.main -# asset:artifact/0666.soul_fire_armor/trigger/3.main -# asset:artifact/0667.soul_fire_armor/trigger/3.main - -# 演出 - function asset:artifact/0664.soul_fire_armor/trigger/fullset/particle - playsound block.fire.ambient player @a ~ ~ ~ 2 0.8 0 - playsound particle.soul_escape player @a ~ ~ ~ 2 0 0 - playsound minecraft:block.sculk_sensor.clicking player @a ~ ~ ~ 0.6 0.4 0 - playsound minecraft:block.respawn_anchor.set_spawn player @a ~ ~ ~ 0.6 1 0 - playsound ogg:mob.vex.idle1 player @a ~ ~ ~ 1 0 0 - -# 最大体力-10% - attribute @s generic.max_health modifier add 00000001-0000-0001-0000-029800000003 "FullsetMaxHealthDown" -0.1 multiply_base - -# 最大体力を反映するための即時回復 - effect give @s instant_health 1 0 - -# 火攻撃+10% - data modify storage api: Argument.UUID set value [I;1,1,664,0] - data modify storage api: Argument.Amount set value 0.1 - data modify storage api: Argument.Operation set value "multiply_base" - function api:modifier/attack/fire/add - -# MP回復量+8% - data modify storage api: Argument.UUID set value [I;1,1,664,0] - data modify storage api: Argument.Amount set value 0.08 - data modify storage api: Argument.Operation set value "multiply_base" - function api:modifier/mp_regen/add - -# フルセット用Tagを付与 - tag @s add IG.Fullset - -# スケジュールループ開始 - schedule function asset:artifact/0664.soul_fire_armor/trigger/fullset/loop 1t replace \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0664.soul_fire_armor/trigger/fullset/attack.mcfunction b/Asset/data/asset/functions/artifact/0664.soul_fire_armor/trigger/fullset/attack.mcfunction deleted file mode 100644 index 8c3a7ec056..0000000000 --- a/Asset/data/asset/functions/artifact/0664.soul_fire_armor/trigger/fullset/attack.mcfunction +++ /dev/null @@ -1,23 +0,0 @@ -#> asset:artifact/0664.soul_fire_armor/trigger/fullset/attack -# -# フルセット時の近接攻撃 -# -# @within function asset:artifact/0664.soul_fire_armor/trigger/fullset/attack_trigger - -# 演出 - execute as @e[type=#lib:living,type=!player,tag=Victim,distance=..64] at @s run function asset:artifact/0664.soul_fire_armor/trigger/fullset/particle - execute at @e[type=#lib:living,type=!player,tag=Victim,distance=..64] run playsound block.fire.ambient player @a ~ ~ ~ 2 0.8 0 - execute at @e[type=#lib:living,type=!player,tag=Victim,distance=..64] run playsound particle.soul_escape player @a ~ ~ ~ 2 0 0 - execute at @e[type=#lib:living,type=!player,tag=Victim,distance=..64] run playsound minecraft:block.sculk_sensor.clicking player @a ~ ~ ~ 0.6 0.4 0 - -# ダメージ設定 - data modify storage lib: Argument.Damage set value 80.0f - data modify storage lib: Argument.AttackType set value "Physical" - data modify storage lib: Argument.ElementType set value "Fire" - function lib:damage/modifier - execute as @e[type=#lib:living,type=!player,tag=Victim,distance=..64] run function lib:damage/ -# リセット - function lib:damage/reset - -# クールタイム設定 - scoreboard players set @s IG.AttackCT 20 \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0664.soul_fire_armor/trigger/fullset/attack_trigger.mcfunction b/Asset/data/asset/functions/artifact/0664.soul_fire_armor/trigger/fullset/attack_trigger.mcfunction deleted file mode 100644 index e63c251915..0000000000 --- a/Asset/data/asset/functions/artifact/0664.soul_fire_armor/trigger/fullset/attack_trigger.mcfunction +++ /dev/null @@ -1,8 +0,0 @@ -#> asset:artifact/0664.soul_fire_armor/trigger/fullset/attack_trigger -# -# フルセット検知して近接攻撃するよ -# -# @within tag/function asset:artifact/attack - -# 攻撃 - execute if entity @s[tag=IG.Fullset] unless entity @s[scores={IG.AttackCT=0..}] run function asset:artifact/0664.soul_fire_armor/trigger/fullset/attack \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0664.soul_fire_armor/trigger/fullset/fullset_dis_equip.mcfunction b/Asset/data/asset/functions/artifact/0664.soul_fire_armor/trigger/fullset/fullset_dis_equip.mcfunction deleted file mode 100644 index dbb3d8e360..0000000000 --- a/Asset/data/asset/functions/artifact/0664.soul_fire_armor/trigger/fullset/fullset_dis_equip.mcfunction +++ /dev/null @@ -1,27 +0,0 @@ -#> asset:artifact/0664.soul_fire_armor/trigger/fullset/fullset_dis_equip -# -# フルセット効果を消すよ -# -# @within function -# asset:artifact/0664.soul_fire_armor/trigger/dis_equip/main -# asset:artifact/0665.soul_fire_armor/trigger/dis_equip/main -# asset:artifact/0666.soul_fire_armor/trigger/dis_equip/main -# asset:artifact/0667.soul_fire_armor/trigger/dis_equip/main - -# 演出 - function asset:artifact/0664.soul_fire_armor/trigger/fullset/particle2 - -# 火攻撃 - data modify storage api: Argument.UUID set value [I;1,1,664,0] - function api:modifier/attack/fire/remove - -# MP回復量 - data modify storage api: Argument.UUID set value [I;1,1,664,0] - function api:modifier/mp_regen/remove - -# 最大体力-10% - attribute @s generic.max_health modifier remove 00000001-0000-0001-0000-029800000003 - -# リセット - tag @s remove IG.Fullset - scoreboard players reset @s IG.AttackCT \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0664.soul_fire_armor/trigger/fullset/loop.mcfunction b/Asset/data/asset/functions/artifact/0664.soul_fire_armor/trigger/fullset/loop.mcfunction deleted file mode 100644 index c6ab751113..0000000000 --- a/Asset/data/asset/functions/artifact/0664.soul_fire_armor/trigger/fullset/loop.mcfunction +++ /dev/null @@ -1,11 +0,0 @@ -#> asset:artifact/0664.soul_fire_armor/trigger/fullset/loop -# -# スケジュールループするよ -# -# @within function -# asset:artifact/0664.soul_fire_armor/trigger/fullset/ -# asset:artifact/0664.soul_fire_armor/trigger/fullset/main -# asset:artifact/0664.soul_fire_armor/trigger/rejoin_process - -# メイン処理 - execute as @a[tag=IG.Fullset] at @s run function asset:artifact/0664.soul_fire_armor/trigger/fullset/main \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0664.soul_fire_armor/trigger/fullset/main.mcfunction b/Asset/data/asset/functions/artifact/0664.soul_fire_armor/trigger/fullset/main.mcfunction deleted file mode 100644 index 1912f8efa1..0000000000 --- a/Asset/data/asset/functions/artifact/0664.soul_fire_armor/trigger/fullset/main.mcfunction +++ /dev/null @@ -1,16 +0,0 @@ -#> asset:artifact/0664.soul_fire_armor/trigger/fullset/main -# -# フルセット時のメイン処理 -# -# @within function asset:artifact/0664.soul_fire_armor/trigger/fullset/loop - -# 演出 - particle soul ~ ~1.2 ~ 2 0.5 2 0.03 1 normal @a - particle soul_fire_flame ~ ~1.2 ~ 2 0.5 2 0.03 1 normal @a - -# AttackCTの処理 - execute if entity @s[scores={IG.AttackCT=0..}] run scoreboard players remove @s IG.AttackCT 1 - execute if entity @s[scores={IG.AttackCT=..0}] run scoreboard players reset @s IG.AttackCT - -# スケジュールループ - execute if entity @s[tag=IG.Fullset] run schedule function asset:artifact/0664.soul_fire_armor/trigger/fullset/loop 1t replace \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0664.soul_fire_armor/trigger/fullset/particle2.mcfunction b/Asset/data/asset/functions/artifact/0664.soul_fire_armor/trigger/fullset/particle2.mcfunction deleted file mode 100644 index 8ba691838f..0000000000 --- a/Asset/data/asset/functions/artifact/0664.soul_fire_armor/trigger/fullset/particle2.mcfunction +++ /dev/null @@ -1,299 +0,0 @@ -#> asset:artifact/0664.soul_fire_armor/trigger/fullset/particle2 -# -# 装備外したときのパーティクル -# -# @within function asset:artifact/0664.soul_fire_armor/trigger/fullset/fullset_dis_equip - -# 1つ目の円 - execute rotated ~0 0 positioned ^ ^0.3 ^ rotated ~ ~5 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000001 0 normal @a - execute rotated ~30 0 positioned ^ ^0.3 ^ rotated ~ ~5 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000001 0 normal @a - execute rotated ~60 0 positioned ^ ^0.3 ^ rotated ~ ~5 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000001 0 normal @a - execute rotated ~90 0 positioned ^ ^0.3 ^ rotated ~ ~5 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000001 0 normal @a - execute rotated ~120 0 positioned ^ ^0.3 ^ rotated ~ ~5 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000001 0 normal @a - execute rotated ~150 0 positioned ^ ^0.3 ^ rotated ~ ~5 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000001 0 normal @a - execute rotated ~180 0 positioned ^ ^0.3 ^ rotated ~ ~5 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000001 0 normal @a - execute rotated ~210 0 positioned ^ ^0.3 ^ rotated ~ ~5 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000001 0 normal @a - execute rotated ~240 0 positioned ^ ^0.3 ^ rotated ~ ~5 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000001 0 normal @a - execute rotated ~270 0 positioned ^ ^0.3 ^ rotated ~ ~5 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000001 0 normal @a - execute rotated ~300 0 positioned ^ ^0.3 ^ rotated ~ ~5 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000001 0 normal @a - execute rotated ~330 0 positioned ^ ^0.3 ^ rotated ~ ~5 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000001 0 normal @a - -# 2つ目の円 - execute rotated ~0 0 positioned ^ ^0.2 ^ rotated ~ ~-20 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a - execute rotated ~20 0 positioned ^ ^0.2 ^ rotated ~ ~-20 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a - execute rotated ~40 0 positioned ^ ^0.2 ^ rotated ~ ~-20 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a - execute rotated ~60 0 positioned ^ ^0.2 ^ rotated ~ ~-20 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a - execute rotated ~80 0 positioned ^ ^0.2 ^ rotated ~ ~-20 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a - execute rotated ~100 0 positioned ^ ^0.2 ^ rotated ~ ~-20 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a - execute rotated ~120 0 positioned ^ ^0.2 ^ rotated ~ ~-20 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a - execute rotated ~140 0 positioned ^ ^0.2 ^ rotated ~ ~-20 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a - execute rotated ~160 0 positioned ^ ^0.2 ^ rotated ~ ~-20 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a - execute rotated ~180 0 positioned ^ ^0.2 ^ rotated ~ ~-20 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a - execute rotated ~200 0 positioned ^ ^0.2 ^ rotated ~ ~-20 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a - execute rotated ~220 0 positioned ^ ^0.2 ^ rotated ~ ~-20 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a - execute rotated ~240 0 positioned ^ ^0.2 ^ rotated ~ ~-20 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a - execute rotated ~260 0 positioned ^ ^0.2 ^ rotated ~ ~-20 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a - execute rotated ~280 0 positioned ^ ^0.2 ^ rotated ~ ~-20 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a - execute rotated ~300 0 positioned ^ ^0.2 ^ rotated ~ ~-20 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a - execute rotated ~320 0 positioned ^ ^0.2 ^ rotated ~ ~-20 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a - execute rotated ~340 0 positioned ^ ^0.2 ^ rotated ~ ~-20 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a - -# 2つ目の円 - execute rotated ~0 0 positioned ^ ^0.2 ^ rotated ~ ~-40 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a - execute rotated ~10 0 positioned ^ ^0.2 ^ rotated ~ ~-40 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a - execute rotated ~20 0 positioned ^ ^0.2 ^ rotated ~ ~-40 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a - execute rotated ~30 0 positioned ^ ^0.2 ^ rotated ~ ~-40 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a - execute rotated ~40 0 positioned ^ ^0.2 ^ rotated ~ ~-40 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a - execute rotated ~50 0 positioned ^ ^0.2 ^ rotated ~ ~-40 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a - execute rotated ~60 0 positioned ^ ^0.2 ^ rotated ~ ~-40 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a - execute rotated ~70 0 positioned ^ ^0.2 ^ rotated ~ ~-40 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a - execute rotated ~80 0 positioned ^ ^0.2 ^ rotated ~ ~-40 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a - execute rotated ~90 0 positioned ^ ^0.2 ^ rotated ~ ~-40 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a - execute rotated ~100 0 positioned ^ ^0.2 ^ rotated ~ ~-40 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a - execute rotated ~110 0 positioned ^ ^0.2 ^ rotated ~ ~-40 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a - execute rotated ~120 0 positioned ^ ^0.2 ^ rotated ~ ~-40 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a - execute rotated ~130 0 positioned ^ ^0.2 ^ rotated ~ ~-40 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a - execute rotated ~140 0 positioned ^ ^0.2 ^ rotated ~ ~-40 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a - execute rotated ~150 0 positioned ^ ^0.2 ^ rotated ~ ~-40 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a - execute rotated ~160 0 positioned ^ ^0.2 ^ rotated ~ ~-40 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a - execute rotated ~170 0 positioned ^ ^0.2 ^ rotated ~ ~-40 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a - execute rotated ~180 0 positioned ^ ^0.2 ^ rotated ~ ~-40 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a - execute rotated ~190 0 positioned ^ ^0.2 ^ rotated ~ ~-40 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a - execute rotated ~200 0 positioned ^ ^0.2 ^ rotated ~ ~-40 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a - execute rotated ~210 0 positioned ^ ^0.2 ^ rotated ~ ~-40 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a - execute rotated ~220 0 positioned ^ ^0.2 ^ rotated ~ ~-40 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a - execute rotated ~230 0 positioned ^ ^0.2 ^ rotated ~ ~-40 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a - execute rotated ~240 0 positioned ^ ^0.2 ^ rotated ~ ~-40 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a - execute rotated ~250 0 positioned ^ ^0.2 ^ rotated ~ ~-40 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a - execute rotated ~260 0 positioned ^ ^0.2 ^ rotated ~ ~-40 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a - execute rotated ~270 0 positioned ^ ^0.2 ^ rotated ~ ~-40 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a - execute rotated ~280 0 positioned ^ ^0.2 ^ rotated ~ ~-40 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a - execute rotated ~290 0 positioned ^ ^0.2 ^ rotated ~ ~-40 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a - execute rotated ~300 0 positioned ^ ^0.2 ^ rotated ~ ~-40 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a - execute rotated ~310 0 positioned ^ ^0.2 ^ rotated ~ ~-40 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a - execute rotated ~320 0 positioned ^ ^0.2 ^ rotated ~ ~-40 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a - execute rotated ~330 0 positioned ^ ^0.2 ^ rotated ~ ~-40 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a - execute rotated ~340 0 positioned ^ ^0.2 ^ rotated ~ ~-40 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a - execute rotated ~350 0 positioned ^ ^0.2 ^ rotated ~ ~-40 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a - -# 4つ目の円 - execute rotated ~0 0 positioned ^ ^0.2 ^ rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a - execute rotated ~5 0 positioned ^ ^0.2 ^ rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a - execute rotated ~10 0 positioned ^ ^0.2 ^ rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a - execute rotated ~15 0 positioned ^ ^0.2 ^ rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a - execute rotated ~20 0 positioned ^ ^0.2 ^ rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a - execute rotated ~25 0 positioned ^ ^0.2 ^ rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a - execute rotated ~30 0 positioned ^ ^0.2 ^ rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a - execute rotated ~35 0 positioned ^ ^0.2 ^ rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a - execute rotated ~40 0 positioned ^ ^0.2 ^ rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a - execute rotated ~45 0 positioned ^ ^0.2 ^ rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a - execute rotated ~50 0 positioned ^ ^0.2 ^ rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a - execute rotated ~55 0 positioned ^ ^0.2 ^ rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a - execute rotated ~60 0 positioned ^ ^0.2 ^ rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a - execute rotated ~65 0 positioned ^ ^0.2 ^ rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a - execute rotated ~70 0 positioned ^ ^0.2 ^ rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a - execute rotated ~75 0 positioned ^ ^0.2 ^ rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a - execute rotated ~80 0 positioned ^ ^0.2 ^ rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a - execute rotated ~85 0 positioned ^ ^0.2 ^ rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a - execute rotated ~90 0 positioned ^ ^0.2 ^ rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a - execute rotated ~95 0 positioned ^ ^0.2 ^ rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a - execute rotated ~100 0 positioned ^ ^0.2 ^ rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a - execute rotated ~105 0 positioned ^ ^0.2 ^ rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a - execute rotated ~110 0 positioned ^ ^0.2 ^ rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a - execute rotated ~115 0 positioned ^ ^0.2 ^ rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a - execute rotated ~120 0 positioned ^ ^0.2 ^ rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a - execute rotated ~125 0 positioned ^ ^0.2 ^ rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a - execute rotated ~130 0 positioned ^ ^0.2 ^ rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a - execute rotated ~135 0 positioned ^ ^0.2 ^ rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a - execute rotated ~140 0 positioned ^ ^0.2 ^ rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a - execute rotated ~145 0 positioned ^ ^0.2 ^ rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a - execute rotated ~150 0 positioned ^ ^0.2 ^ rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a - execute rotated ~155 0 positioned ^ ^0.2 ^ rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a - execute rotated ~160 0 positioned ^ ^0.2 ^ rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a - execute rotated ~165 0 positioned ^ ^0.2 ^ rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a - execute rotated ~170 0 positioned ^ ^0.2 ^ rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a - execute rotated ~175 0 positioned ^ ^0.2 ^ rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a - execute rotated ~180 0 positioned ^ ^0.2 ^ rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a - execute rotated ~185 0 positioned ^ ^0.2 ^ rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a - execute rotated ~190 0 positioned ^ ^0.2 ^ rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a - execute rotated ~195 0 positioned ^ ^0.2 ^ rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a - execute rotated ~200 0 positioned ^ ^0.2 ^ rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a - execute rotated ~205 0 positioned ^ ^0.2 ^ rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a - execute rotated ~210 0 positioned ^ ^0.2 ^ rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a - execute rotated ~215 0 positioned ^ ^0.2 ^ rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a - execute rotated ~220 0 positioned ^ ^0.2 ^ rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a - execute rotated ~225 0 positioned ^ ^0.2 ^ rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a - execute rotated ~230 0 positioned ^ ^0.2 ^ rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a - execute rotated ~235 0 positioned ^ ^0.2 ^ rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a - execute rotated ~240 0 positioned ^ ^0.2 ^ rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a - execute rotated ~245 0 positioned ^ ^0.2 ^ rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a - execute rotated ~250 0 positioned ^ ^0.2 ^ rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a - execute rotated ~255 0 positioned ^ ^0.2 ^ rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a - execute rotated ~260 0 positioned ^ ^0.2 ^ rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a - execute rotated ~265 0 positioned ^ ^0.2 ^ rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a - execute rotated ~270 0 positioned ^ ^0.2 ^ rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a - execute rotated ~275 0 positioned ^ ^0.2 ^ rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a - execute rotated ~280 0 positioned ^ ^0.2 ^ rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a - execute rotated ~285 0 positioned ^ ^0.2 ^ rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a - execute rotated ~290 0 positioned ^ ^0.2 ^ rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a - execute rotated ~295 0 positioned ^ ^0.2 ^ rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a - execute rotated ~300 0 positioned ^ ^0.2 ^ rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a - execute rotated ~305 0 positioned ^ ^0.2 ^ rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a - execute rotated ~310 0 positioned ^ ^0.2 ^ rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a - execute rotated ~315 0 positioned ^ ^0.2 ^ rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a - execute rotated ~320 0 positioned ^ ^0.2 ^ rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a - execute rotated ~325 0 positioned ^ ^0.2 ^ rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a - execute rotated ~330 0 positioned ^ ^0.2 ^ rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a - execute rotated ~335 0 positioned ^ ^0.2 ^ rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a - execute rotated ~340 0 positioned ^ ^0.2 ^ rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a - execute rotated ~345 0 positioned ^ ^0.2 ^ rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a - execute rotated ~350 0 positioned ^ ^0.2 ^ rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a - execute rotated ~355 0 positioned ^ ^0.2 ^ rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a - -# ここより下はsoul_fire ver - -# 1つ目の円 - execute rotated ~0 0 positioned ^ ^0 ^ rotated ~ ~-5 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000001 0 normal @a - execute rotated ~30 0 positioned ^ ^0 ^ rotated ~ ~-5 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000001 0 normal @a - execute rotated ~60 0 positioned ^ ^0 ^ rotated ~ ~-5 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000001 0 normal @a - execute rotated ~90 0 positioned ^ ^0 ^ rotated ~ ~-5 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000001 0 normal @a - execute rotated ~120 0 positioned ^ ^0 ^ rotated ~ ~-5 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000001 0 normal @a - execute rotated ~150 0 positioned ^ ^0 ^ rotated ~ ~-5 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000001 0 normal @a - execute rotated ~180 0 positioned ^ ^0 ^ rotated ~ ~-5 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000001 0 normal @a - execute rotated ~210 0 positioned ^ ^0 ^ rotated ~ ~-5 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000001 0 normal @a - execute rotated ~240 0 positioned ^ ^0 ^ rotated ~ ~-5 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000001 0 normal @a - execute rotated ~270 0 positioned ^ ^0 ^ rotated ~ ~-5 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000001 0 normal @a - execute rotated ~300 0 positioned ^ ^0 ^ rotated ~ ~-5 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000001 0 normal @a - execute rotated ~330 0 positioned ^ ^0 ^ rotated ~ ~-5 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000001 0 normal @a - -# 2つ目の円 - execute rotated ~0 0 positioned ^ ^0 ^ rotated ~ ~-20 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a - execute rotated ~20 0 positioned ^ ^0 ^ rotated ~ ~-20 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a - execute rotated ~40 0 positioned ^ ^0 ^ rotated ~ ~-20 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a - execute rotated ~60 0 positioned ^ ^0 ^ rotated ~ ~-20 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a - execute rotated ~80 0 positioned ^ ^0 ^ rotated ~ ~-20 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a - execute rotated ~100 0 positioned ^ ^0 ^ rotated ~ ~-20 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a - execute rotated ~120 0 positioned ^ ^0 ^ rotated ~ ~-20 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a - execute rotated ~140 0 positioned ^ ^0 ^ rotated ~ ~-20 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a - execute rotated ~160 0 positioned ^ ^0 ^ rotated ~ ~-20 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a - execute rotated ~180 0 positioned ^ ^0 ^ rotated ~ ~-20 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a - execute rotated ~200 0 positioned ^ ^0 ^ rotated ~ ~-20 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a - execute rotated ~220 0 positioned ^ ^0 ^ rotated ~ ~-20 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a - execute rotated ~240 0 positioned ^ ^0 ^ rotated ~ ~-20 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a - execute rotated ~260 0 positioned ^ ^0 ^ rotated ~ ~-20 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a - execute rotated ~280 0 positioned ^ ^0 ^ rotated ~ ~-20 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a - execute rotated ~300 0 positioned ^ ^0 ^ rotated ~ ~-20 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a - execute rotated ~320 0 positioned ^ ^0 ^ rotated ~ ~-20 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a - execute rotated ~340 0 positioned ^ ^0 ^ rotated ~ ~-20 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a - -# 2つ目の円 - execute rotated ~0 0 positioned ^ ^0 ^ rotated ~ ~-40 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a - execute rotated ~10 0 positioned ^ ^0 ^ rotated ~ ~-40 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a - execute rotated ~20 0 positioned ^ ^0 ^ rotated ~ ~-40 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a - execute rotated ~30 0 positioned ^ ^0 ^ rotated ~ ~-40 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a - execute rotated ~40 0 positioned ^ ^0 ^ rotated ~ ~-40 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a - execute rotated ~50 0 positioned ^ ^0 ^ rotated ~ ~-40 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a - execute rotated ~60 0 positioned ^ ^0 ^ rotated ~ ~-40 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a - execute rotated ~70 0 positioned ^ ^0 ^ rotated ~ ~-40 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a - execute rotated ~80 0 positioned ^ ^0 ^ rotated ~ ~-40 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a - execute rotated ~90 0 positioned ^ ^0 ^ rotated ~ ~-40 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a - execute rotated ~100 0 positioned ^ ^0 ^ rotated ~ ~-40 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a - execute rotated ~110 0 positioned ^ ^0 ^ rotated ~ ~-40 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a - execute rotated ~120 0 positioned ^ ^0 ^ rotated ~ ~-40 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a - execute rotated ~130 0 positioned ^ ^0 ^ rotated ~ ~-40 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a - execute rotated ~140 0 positioned ^ ^0 ^ rotated ~ ~-40 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a - execute rotated ~150 0 positioned ^ ^0 ^ rotated ~ ~-40 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a - execute rotated ~160 0 positioned ^ ^0 ^ rotated ~ ~-40 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a - execute rotated ~170 0 positioned ^ ^0 ^ rotated ~ ~-40 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a - execute rotated ~180 0 positioned ^ ^0 ^ rotated ~ ~-40 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a - execute rotated ~190 0 positioned ^ ^0 ^ rotated ~ ~-40 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a - execute rotated ~200 0 positioned ^ ^0 ^ rotated ~ ~-40 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a - execute rotated ~210 0 positioned ^ ^0 ^ rotated ~ ~-40 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a - execute rotated ~220 0 positioned ^ ^0 ^ rotated ~ ~-40 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a - execute rotated ~230 0 positioned ^ ^0 ^ rotated ~ ~-40 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a - execute rotated ~240 0 positioned ^ ^0 ^ rotated ~ ~-40 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a - execute rotated ~250 0 positioned ^ ^0 ^ rotated ~ ~-40 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a - execute rotated ~260 0 positioned ^ ^0 ^ rotated ~ ~-40 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a - execute rotated ~270 0 positioned ^ ^0 ^ rotated ~ ~-40 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a - execute rotated ~280 0 positioned ^ ^0 ^ rotated ~ ~-40 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a - execute rotated ~290 0 positioned ^ ^0 ^ rotated ~ ~-40 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a - execute rotated ~300 0 positioned ^ ^0 ^ rotated ~ ~-40 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a - execute rotated ~310 0 positioned ^ ^0 ^ rotated ~ ~-40 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a - execute rotated ~320 0 positioned ^ ^0 ^ rotated ~ ~-40 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a - execute rotated ~330 0 positioned ^ ^0 ^ rotated ~ ~-40 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a - execute rotated ~340 0 positioned ^ ^0 ^ rotated ~ ~-40 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a - execute rotated ~350 0 positioned ^ ^0 ^ rotated ~ ~-40 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a - -# 4つ目の円 - execute rotated ~0 0 positioned ^ ^0 ^ rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a - execute rotated ~5 0 positioned ^ ^0 ^ rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a - execute rotated ~10 0 positioned ^ ^0 ^ rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a - execute rotated ~15 0 positioned ^ ^0 ^ rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a - execute rotated ~20 0 positioned ^ ^0 ^ rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a - execute rotated ~25 0 positioned ^ ^0 ^ rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a - execute rotated ~30 0 positioned ^ ^0 ^ rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a - execute rotated ~35 0 positioned ^ ^0 ^ rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a - execute rotated ~40 0 positioned ^ ^0 ^ rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a - execute rotated ~45 0 positioned ^ ^0 ^ rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a - execute rotated ~50 0 positioned ^ ^0 ^ rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a - execute rotated ~55 0 positioned ^ ^0 ^ rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a - execute rotated ~60 0 positioned ^ ^0 ^ rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a - execute rotated ~65 0 positioned ^ ^0 ^ rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a - execute rotated ~70 0 positioned ^ ^0 ^ rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a - execute rotated ~75 0 positioned ^ ^0 ^ rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a - execute rotated ~80 0 positioned ^ ^0 ^ rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a - execute rotated ~85 0 positioned ^ ^0 ^ rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a - execute rotated ~90 0 positioned ^ ^0 ^ rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a - execute rotated ~95 0 positioned ^ ^0 ^ rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a - execute rotated ~100 0 positioned ^ ^0 ^ rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a - execute rotated ~105 0 positioned ^ ^0 ^ rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a - execute rotated ~110 0 positioned ^ ^0 ^ rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a - execute rotated ~115 0 positioned ^ ^0 ^ rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a - execute rotated ~120 0 positioned ^ ^0 ^ rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a - execute rotated ~125 0 positioned ^ ^0 ^ rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a - execute rotated ~130 0 positioned ^ ^0 ^ rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a - execute rotated ~135 0 positioned ^ ^0 ^ rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a - execute rotated ~140 0 positioned ^ ^0 ^ rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a - execute rotated ~145 0 positioned ^ ^0 ^ rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a - execute rotated ~150 0 positioned ^ ^0 ^ rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a - execute rotated ~155 0 positioned ^ ^0 ^ rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a - execute rotated ~160 0 positioned ^ ^0 ^ rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a - execute rotated ~165 0 positioned ^ ^0 ^ rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a - execute rotated ~170 0 positioned ^ ^0 ^ rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a - execute rotated ~175 0 positioned ^ ^0 ^ rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a - execute rotated ~180 0 positioned ^ ^0 ^ rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a - execute rotated ~185 0 positioned ^ ^0 ^ rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a - execute rotated ~190 0 positioned ^ ^0 ^ rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a - execute rotated ~195 0 positioned ^ ^0 ^ rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a - execute rotated ~200 0 positioned ^ ^0 ^ rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a - execute rotated ~205 0 positioned ^ ^0 ^ rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a - execute rotated ~210 0 positioned ^ ^0 ^ rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a - execute rotated ~215 0 positioned ^ ^0 ^ rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a - execute rotated ~220 0 positioned ^ ^0 ^ rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a - execute rotated ~225 0 positioned ^ ^0 ^ rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a - execute rotated ~230 0 positioned ^ ^0 ^ rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a - execute rotated ~235 0 positioned ^ ^0 ^ rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a - execute rotated ~240 0 positioned ^ ^0 ^ rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a - execute rotated ~245 0 positioned ^ ^0 ^ rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a - execute rotated ~250 0 positioned ^ ^0 ^ rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a - execute rotated ~255 0 positioned ^ ^0 ^ rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a - execute rotated ~260 0 positioned ^ ^0 ^ rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a - execute rotated ~265 0 positioned ^ ^0 ^ rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a - execute rotated ~270 0 positioned ^ ^0 ^ rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a - execute rotated ~275 0 positioned ^ ^0 ^ rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a - execute rotated ~280 0 positioned ^ ^0 ^ rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a - execute rotated ~285 0 positioned ^ ^0 ^ rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a - execute rotated ~290 0 positioned ^ ^0 ^ rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a - execute rotated ~295 0 positioned ^ ^0 ^ rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a - execute rotated ~300 0 positioned ^ ^0 ^ rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a - execute rotated ~305 0 positioned ^ ^0 ^ rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a - execute rotated ~310 0 positioned ^ ^0 ^ rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a - execute rotated ~315 0 positioned ^ ^0 ^ rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a - execute rotated ~320 0 positioned ^ ^0 ^ rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a - execute rotated ~325 0 positioned ^ ^0 ^ rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a - execute rotated ~330 0 positioned ^ ^0 ^ rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a - execute rotated ~335 0 positioned ^ ^0 ^ rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a - execute rotated ~340 0 positioned ^ ^0 ^ rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a - execute rotated ~345 0 positioned ^ ^0 ^ rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a - execute rotated ~350 0 positioned ^ ^0 ^ rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a - execute rotated ~355 0 positioned ^ ^0 ^ rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0664.soul_fire_armor/trigger/rejoin_process.mcfunction b/Asset/data/asset/functions/artifact/0664.soul_fire_armor/trigger/rejoin_process.mcfunction deleted file mode 100644 index 3d0874deaa..0000000000 --- a/Asset/data/asset/functions/artifact/0664.soul_fire_armor/trigger/rejoin_process.mcfunction +++ /dev/null @@ -1,8 +0,0 @@ -#> asset:artifact/0664.soul_fire_armor/trigger/rejoin_process -# -# 使い方は必ずwikiを見ること -# -# @within tag/function asset:rejoin - -# スケジュールループ再開 - execute if entity @s[tag=IG.Fullset] at @s run schedule function asset:artifact/0664.soul_fire_armor/trigger/fullset/loop 1t replace \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0665.soul_fire_armor/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0665.soul_fire_armor/give/2.give.mcfunction index 948517a52b..6ceb01e22f 100644 --- a/Asset/data/asset/functions/artifact/0665.soul_fire_armor/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0665.soul_fire_armor/give/2.give.mcfunction @@ -15,7 +15,7 @@ # 神器の名前 (TextComponentString) data modify storage asset:artifact Name set value '{"text":"魂炎纏","color":"#01A7AC","bold":true}' # 神器の説明文 (TextComponentString[]) - data modify storage asset:artifact Lore set value ['[{"text":"物理攻撃+5% ","color":"dark_green"},{"text":"火耐性+10% 火攻撃+10% ","color":"red"}]','[{"text":"MP回復量+8% ","color":"green"},{"text":"最大体力-10%","color":"dark_red"}]','[{"text":"魂炎を完全に纏いし時","color":"#01A7AC"}]','[{"text":"火攻撃+10% ","color":"red"},{"text":"MP回復量+8% ","color":"green"},{"text":"最大体力-10%","color":"dark_red"}]','[{"text":"魂炎を纏う者に代償を。","color":"#017C80","italic":true}]','[{"text":"代償背負いし者へ力を。","color":"#017C80","italic":true}]'] + data modify storage asset:artifact Lore set value ['{"text":"魂炎を纏う者に代償を。","color":"#017C80","italic":true}','{"text":"代償背負いし者へ力を。","color":"#017C80","italic":true}'] # MP以外の消費物 (TextComponentString) (オプション) # data modify storage asset:artifact CostText set value # 使用回数 (int) (オプション) @@ -23,19 +23,19 @@ # 神器を発動できるスロット (string) Wikiを参照 data modify storage asset:artifact Slot set value "chest" # 神器のトリガー (string) Wikiを参照 - data modify storage asset:artifact Trigger set value "equipping" + data modify storage asset:artifact Trigger set value "onAttack" # 神器の発動条件 (TextComponentString) (オプション) # data modify storage asset:artifact Condition set value # 攻撃に関する情報 -Damage量 (literal[]/literal) Wikiを参照 (オプション) - # data modify storage asset:artifact AttackInfo.Damage set value [0,0] + data modify storage asset:artifact AttackInfo.Damage set value 80 # 攻撃に関する情報 -攻撃タイプ (string[]) Wikiを参照 (オプション) - # data modify storage asset:artifact AttackInfo.AttackType set value [Physical,Magic] + data modify storage asset:artifact AttackInfo.AttackType set value [Physical] # 攻撃に関する情報 -攻撃属性 (string[]) Wikiを参照 (オプション) - # data modify storage asset:artifact AttackInfo.ElementType set value [Fire,Water,Thunder,None] + data modify storage asset:artifact AttackInfo.ElementType set value [Fire] # 攻撃に関する情報 -防御無視 (boolean) Wikiを参照 (オプション) # data modify storage asset:artifact AttackInfo.BypassResist set value # 攻撃に関する情報 -範囲攻撃 (string) Wikiを参照 (オプション) - # data modify storage asset:artifact AttackInfo.IsRangeAttack set value + data modify storage asset:artifact AttackInfo.IsRangeAttack set value "never" # 攻撃に関する情報 -攻撃範囲 (literal) Wikiを参照 (オプション) # data modify storage asset:artifact AttackInfo.AttackRange set value # MP消費量 (int) @@ -50,10 +50,14 @@ # data modify storage asset:artifact DisableCooldownMessage set value # MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション) # data modify storage asset:artifact DisableMPMessage set value +# セット装備のID (int) (オプション) + data modify storage asset:artifact EquipID set value 232 +# 装備時のステータス補正 (Component[]) (オプション) + data modify storage asset:artifact Modifiers set value [{Type:"maxHealth",Slot:"chest",Amount:-0.10d,Operation:"multiply_base"},{Type:"attackPhysical",Slot:"chest",Amount:0.05d,Operation:"multiply_base"},{Type:"attackFire",Slot:"chest",Amount:0.10d,Operation:"multiply_base"},{Type:"defenseFire",Slot:"chest",Amount:0.10d,Operation:"multiply_base"},{Type:"mpRegen",Slot:"chest",Amount:0.08d,Operation:"multiply_base"}] # 扱える神 (string[]) Wikiを参照 data modify storage asset:artifact CanUsedGod set value ["Urban", "Nyaptov", "Rumor"] # カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) - data modify storage asset:artifact CustomNBT set value {HideFlags:68,display:{color:3071974},Unbreakable:1b,AttributeModifiers:[{AttributeName:"generic.armor",Name:"generic.armor",Amount:8,Operation:0,UUID:[I;1,1,665,5],Slot:"chest"},{AttributeName:"generic.armor_toughness",Name:"generic.armor_toughness",Amount:2.5,Operation:0,UUID:[I;1,1,665,5],Slot:"chest"}]} + data modify storage asset:artifact CustomNBT set value {HideFlags:196,display:{color:3071974},Trim:{material:"diamond",pattern:"tsb_armor:664"},Unbreakable:1b,AttributeModifiers:[{AttributeName:"generic.armor",Name:"generic.armor",Amount:5,Operation:0,UUID:[I;1,1,664,6],Slot:"chest"},{AttributeName:"generic.armor_toughness",Name:"generic.armor_toughness",Amount:2.5,Operation:0,UUID:[I;1,1,664,6],Slot:"chest"}]} # 神器の入手用function function asset:artifact/common/give diff --git a/Asset/data/asset/functions/artifact/0665.soul_fire_armor/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0665.soul_fire_armor/trigger/3.main.mcfunction deleted file mode 100644 index db39f65c2f..0000000000 --- a/Asset/data/asset/functions/artifact/0665.soul_fire_armor/trigger/3.main.mcfunction +++ /dev/null @@ -1,52 +0,0 @@ -#> asset:artifact/0665.soul_fire_armor/trigger/3.main -# -# 神器のメイン処理部 -# -# @within function asset:artifact/0665.soul_fire_armor/trigger/2.check_condition - -# 基本的な使用時の処理(MP消費や使用回数の処理など)を行う - function asset:artifact/common/use/chest - -# ここから先は神器側の効果の処理を書く - -# 演出 - execute unless data storage asset:context id.all{head:664,chest:665,legs:666,feet:667} positioned ~ ~0.8 ~ facing entity @s eyes rotated ~ 0 run function asset:artifact/0664.soul_fire_armor/trigger/particle - execute unless data storage asset:context id.all{head:664,chest:665,legs:666,feet:667} positioned ~ ~1.1 ~ facing entity @s eyes rotated ~ 0 run function asset:artifact/0664.soul_fire_armor/trigger/particle - execute unless data storage asset:context id.all{head:664,chest:665,legs:666,feet:667} positioned ~ ~1.4 ~ facing entity @s eyes rotated ~ 0 run function asset:artifact/0664.soul_fire_armor/trigger/particle - playsound block.fire.ambient player @a ~ ~ ~ 1.5 0.8 0 - playsound particle.soul_escape player @a ~ ~ ~ 2 0 0 - playsound minecraft:block.sculk_sensor.clicking player @a ~ ~ ~ 0.8 0 - playsound ogg:mob.vex.idle1 player @a ~ ~ ~ 1 0 0 - -# 物理攻撃+5% - data modify storage api: Argument.UUID set value [I;1,1,665,5] - data modify storage api: Argument.Amount set value 0.05 - data modify storage api: Argument.Operation set value "multiply_base" - function api:modifier/attack/physical/add - -# 火耐性+10% - data modify storage api: Argument.UUID set value [I;1,1,665,5] - data modify storage api: Argument.Amount set value 0.1 - data modify storage api: Argument.Operation set value "multiply_base" - function api:modifier/defense/fire/add - -# 火攻撃+10% - data modify storage api: Argument.UUID set value [I;1,1,665,5] - data modify storage api: Argument.Amount set value 0.1 - data modify storage api: Argument.Operation set value "multiply_base" - function api:modifier/attack/fire/add - -# MP回復量+8% - data modify storage api: Argument.UUID set value [I;1,1,665,5] - data modify storage api: Argument.Amount set value 0.08 - data modify storage api: Argument.Operation set value "multiply_base" - function api:modifier/mp_regen/add - -# 最大体力-10% - attribute @s generic.max_health modifier add 00000001-0000-0001-0000-029900000005 "MaxHealthDown" -0.1 multiply_base - -# 最大体力を反映するための即時回復 - effect give @s instant_health 1 0 - -# フルセット検知 - execute if data storage asset:context id.all{head:664,chest:665,legs:666,feet:667} run function asset:artifact/0664.soul_fire_armor/trigger/fullset/ \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0665.soul_fire_armor/trigger/dis_equip/main.mcfunction b/Asset/data/asset/functions/artifact/0665.soul_fire_armor/trigger/dis_equip/main.mcfunction index 5068b44ff5..8743f7a646 100644 --- a/Asset/data/asset/functions/artifact/0665.soul_fire_armor/trigger/dis_equip/main.mcfunction +++ b/Asset/data/asset/functions/artifact/0665.soul_fire_armor/trigger/dis_equip/main.mcfunction @@ -4,32 +4,14 @@ # # @within function asset:artifact/0665.soul_fire_armor/trigger/dis_equip/ +# 装備部位数を取得 + data modify storage api: Argument.ID set value 232 + function api:entity/mob/effect/get/from_id + # 演出 - execute if entity @s[tag=!IG.Fullset] positioned ~ ~0.8 ~ run function asset:artifact/0664.soul_fire_armor/trigger/particle2 - execute if entity @s[tag=!IG.Fullset] positioned ~ ~1.1 ~ run function asset:artifact/0664.soul_fire_armor/trigger/particle2 - execute if entity @s[tag=!IG.Fullset] positioned ~ ~1.4 ~ run function asset:artifact/0664.soul_fire_armor/trigger/particle2 + execute unless data storage api: Return.Effect{Stack:4} positioned ~ ~0.8 ~ run function asset:artifact/0664.soul_fire_armor/trigger/dis_equip/particle + execute unless data storage api: Return.Effect{Stack:4} positioned ~ ~1.1 ~ run function asset:artifact/0664.soul_fire_armor/trigger/dis_equip/particle + execute unless data storage api: Return.Effect{Stack:4} positioned ~ ~1.4 ~ run function asset:artifact/0664.soul_fire_armor/trigger/dis_equip/particle playsound block.fire.ambient player @a ~ ~ ~ 1.5 0.8 0 playsound particle.soul_escape player @a ~ ~ ~ 2 0 0 playsound ogg:mob.vex.idle1 player @a ~ ~ ~ 1 0 0 - -# 物理攻撃 - data modify storage api: Argument.UUID set value [I;1,1,665,5] - function api:modifier/attack/physical/remove - -# 火耐性 - data modify storage api: Argument.UUID set value [I;1,1,665,5] - function api:modifier/defense/fire/remove - -# 火攻撃 - data modify storage api: Argument.UUID set value [I;1,1,665,5] - function api:modifier/attack/fire/remove - -# MP回復量 - data modify storage api: Argument.UUID set value [I;1,1,665,5] - function api:modifier/mp_regen/remove - -# 最大体力 - attribute @s generic.max_health modifier remove 00000001-0000-0001-0000-029900000005 - -# フルセット解除 - execute if entity @s[tag=IG.Fullset] run function asset:artifact/0664.soul_fire_armor/trigger/fullset/fullset_dis_equip \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0665.soul_fire_armor/trigger/equip/1.trigger.mcfunction b/Asset/data/asset/functions/artifact/0665.soul_fire_armor/trigger/equip/1.trigger.mcfunction new file mode 100644 index 0000000000..08465e50f6 --- /dev/null +++ b/Asset/data/asset/functions/artifact/0665.soul_fire_armor/trigger/equip/1.trigger.mcfunction @@ -0,0 +1,8 @@ +#> asset:artifact/0665.soul_fire_armor/trigger/equip/1.trigger +# +# 指定したイベントタイミングで実行されるfunction +# +# @within tag/function asset:artifact/** + +# storage asset:idのheadに装備している神器のIDが入っているので比較し、~/2.check_condition.mcfunctionを実行する + execute if data storage asset:context id{chest:665} run function asset:artifact/0665.soul_fire_armor/trigger/equip/2.check_condition diff --git a/Asset/data/asset/functions/artifact/0665.soul_fire_armor/trigger/2.check_condition.mcfunction b/Asset/data/asset/functions/artifact/0665.soul_fire_armor/trigger/equip/2.check_condition.mcfunction similarity index 67% rename from Asset/data/asset/functions/artifact/0665.soul_fire_armor/trigger/2.check_condition.mcfunction rename to Asset/data/asset/functions/artifact/0665.soul_fire_armor/trigger/equip/2.check_condition.mcfunction index 5e49e5bdfc..0a265dc29b 100644 --- a/Asset/data/asset/functions/artifact/0665.soul_fire_armor/trigger/2.check_condition.mcfunction +++ b/Asset/data/asset/functions/artifact/0665.soul_fire_armor/trigger/equip/2.check_condition.mcfunction @@ -1,12 +1,12 @@ -#> asset:artifact/0665.soul_fire_armor/trigger/2.check_condition +#> asset:artifact/0665.soul_fire_armor/trigger/equip/2.check_condition # # 神器の発動条件をチェックします # -# @within function asset:artifact/0665.soul_fire_armor/trigger/1.trigger +# @within function asset:artifact/0665.soul_fire_armor/trigger/equip/1.trigger # 神器の基本的な条件の確認を行うfunction、成功している場合CanUsedタグが付く function asset:artifact/common/check_condition/chest # 他にアイテム等確認する場合はここに書く - + # CanUsedタグをチェックして3.main.mcfunctionを実行する - execute if entity @s[tag=CanUsed] run function asset:artifact/0665.soul_fire_armor/trigger/3.main \ No newline at end of file + execute if entity @s[tag=CanUsed] run function asset:artifact/0665.soul_fire_armor/trigger/equip/3.main diff --git a/Asset/data/asset/functions/artifact/0665.soul_fire_armor/trigger/equip/3.main.mcfunction b/Asset/data/asset/functions/artifact/0665.soul_fire_armor/trigger/equip/3.main.mcfunction new file mode 100644 index 0000000000..097707f911 --- /dev/null +++ b/Asset/data/asset/functions/artifact/0665.soul_fire_armor/trigger/equip/3.main.mcfunction @@ -0,0 +1,23 @@ +#> asset:artifact/0665.soul_fire_armor/trigger/equip/3.main +# +# 装備時の処理部 +# +# @within function asset:artifact/0665.soul_fire_armor/trigger/equip/2.check_condition + +# 基本的な使用時の処理(MP消費や使用回数の処理など)を行う + function asset:artifact/common/use/chest + +# ここから先は神器側の効果の処理を書く + +# 装備部位数を取得 + data modify storage api: Argument.ID set value 232 + function api:entity/mob/effect/get/from_id + +# 演出 + execute unless data storage api: Return.Effect{Stack:4} positioned ~ ~0.8 ~ run function asset:artifact/0664.soul_fire_armor/trigger/equip/4.particle + execute unless data storage api: Return.Effect{Stack:4} positioned ~ ~1.1 ~ run function asset:artifact/0664.soul_fire_armor/trigger/equip/4.particle + execute unless data storage api: Return.Effect{Stack:4} positioned ~ ~1.4 ~ run function asset:artifact/0664.soul_fire_armor/trigger/equip/4.particle + playsound block.fire.ambient player @a ~ ~ ~ 1.5 0.8 0 + playsound particle.soul_escape player @a ~ ~ ~ 2 0 0 + playsound minecraft:block.sculk_sensor.clicking player @a ~ ~ ~ 0.8 0 + playsound ogg:mob.vex.idle1 player @a ~ ~ ~ 1 0 0 diff --git a/Asset/data/asset/functions/artifact/0666.soul_fire_armor/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0666.soul_fire_armor/give/2.give.mcfunction index df7dc03418..a13c761848 100644 --- a/Asset/data/asset/functions/artifact/0666.soul_fire_armor/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0666.soul_fire_armor/give/2.give.mcfunction @@ -15,7 +15,7 @@ # 神器の名前 (TextComponentString) data modify storage asset:artifact Name set value '{"text":"魂炎纏","color":"#01A7AC","bold":true}' # 神器の説明文 (TextComponentString[]) - data modify storage asset:artifact Lore set value ['[{"text":"物理攻撃+5% ","color":"dark_green"},{"text":"火耐性+10% 火攻撃+10% ","color":"red"}]','[{"text":"MP回復量+8% ","color":"green"},{"text":"最大体力-10%","color":"dark_red"}]','{"text":"魂炎を纏う者に代償を。","color":"#017C80","italic":true}','{"text":"代償背負いし者へ力を。","color":"#017C80","italic":true}'] + data modify storage asset:artifact Lore set value ['{"text":"魂炎を纏う者に代償を。","color":"#017C80","italic":true}','{"text":"代償背負いし者へ力を。","color":"#017C80","italic":true}'] # MP以外の消費物 (TextComponentString) (オプション) # data modify storage asset:artifact CostText set value # 使用回数 (int) (オプション) @@ -23,19 +23,19 @@ # 神器を発動できるスロット (string) Wikiを参照 data modify storage asset:artifact Slot set value "legs" # 神器のトリガー (string) Wikiを参照 - data modify storage asset:artifact Trigger set value "equipping" + data modify storage asset:artifact Trigger set value "onAttack" # 神器の発動条件 (TextComponentString) (オプション) # data modify storage asset:artifact Condition set value # 攻撃に関する情報 -Damage量 (literal[]/literal) Wikiを参照 (オプション) - # data modify storage asset:artifact AttackInfo.Damage set value [0,0] + data modify storage asset:artifact AttackInfo.Damage set value 80 # 攻撃に関する情報 -攻撃タイプ (string[]) Wikiを参照 (オプション) - # data modify storage asset:artifact AttackInfo.AttackType set value [Physical,Magic] + data modify storage asset:artifact AttackInfo.AttackType set value [Physical] # 攻撃に関する情報 -攻撃属性 (string[]) Wikiを参照 (オプション) - # data modify storage asset:artifact AttackInfo.ElementType set value [Fire,Water,Thunder,None] + data modify storage asset:artifact AttackInfo.ElementType set value [Fire] # 攻撃に関する情報 -防御無視 (boolean) Wikiを参照 (オプション) # data modify storage asset:artifact AttackInfo.BypassResist set value # 攻撃に関する情報 -範囲攻撃 (string) Wikiを参照 (オプション) - # data modify storage asset:artifact AttackInfo.IsRangeAttack set value + data modify storage asset:artifact AttackInfo.IsRangeAttack set value "never" # 攻撃に関する情報 -攻撃範囲 (literal) Wikiを参照 (オプション) # data modify storage asset:artifact AttackInfo.AttackRange set value # MP消費量 (int) @@ -50,10 +50,14 @@ # data modify storage asset:artifact DisableCooldownMessage set value # MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション) # data modify storage asset:artifact DisableMPMessage set value +# セット装備のID (int) (オプション) + data modify storage asset:artifact EquipID set value 232 +# 装備時のステータス補正 (Component[]) (オプション) + data modify storage asset:artifact Modifiers set value [{Type:"maxHealth",Slot:"legs",Amount:-0.10d,Operation:"multiply_base"},{Type:"attackPhysical",Slot:"legs",Amount:0.05d,Operation:"multiply_base"},{Type:"attackFire",Slot:"legs",Amount:0.10d,Operation:"multiply_base"},{Type:"defenseFire",Slot:"legs",Amount:0.10d,Operation:"multiply_base"},{Type:"mpRegen",Slot:"legs",Amount:0.08d,Operation:"multiply_base"}] # 扱える神 (string[]) Wikiを参照 data modify storage asset:artifact CanUsedGod set value ["Urban", "Nyaptov", "Rumor"] # カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) - data modify storage asset:artifact CustomNBT set value {HideFlags:68,display:{color:3071974},Unbreakable:1b,AttributeModifiers:[{AttributeName:"generic.armor",Name:"generic.armor",Amount:7,Operation:0,UUID:[I;1,1,666,4],Slot:"legs"},{AttributeName:"generic.armor_toughness",Name:"generic.armor_toughness",Amount:2.5,Operation:0,UUID:[I;1,1,666,4],Slot:"legs"}]} + data modify storage asset:artifact CustomNBT set value {HideFlags:196,display:{color:3071974},Trim:{material:"diamond",pattern:"tsb_armor:664"},Unbreakable:1b,AttributeModifiers:[{AttributeName:"generic.armor",Name:"generic.armor",Amount:5,Operation:0,UUID:[I;1,1,664,6],Slot:"legs"},{AttributeName:"generic.armor_toughness",Name:"generic.armor_toughness",Amount:2.5,Operation:0,UUID:[I;1,1,664,6],Slot:"legs"}]} # 神器の入手用function function asset:artifact/common/give diff --git a/Asset/data/asset/functions/artifact/0666.soul_fire_armor/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0666.soul_fire_armor/trigger/3.main.mcfunction deleted file mode 100644 index 3d8ad8eca8..0000000000 --- a/Asset/data/asset/functions/artifact/0666.soul_fire_armor/trigger/3.main.mcfunction +++ /dev/null @@ -1,51 +0,0 @@ -#> asset:artifact/0666.soul_fire_armor/trigger/3.main -# -# 神器のメイン処理部 -# -# @within function asset:artifact/0666.soul_fire_armor/trigger/2.check_condition - -# 基本的な使用時の処理(MP消費や使用回数の処理など)を行う - function asset:artifact/common/use/legs - -# ここから先は神器側の効果の処理を書く - -# 演出 - execute unless data storage asset:context id.all{head:664,chest:665,legs:666,feet:667} positioned ~ ~0.4 ~ facing entity @s eyes rotated ~ 0 run function asset:artifact/0664.soul_fire_armor/trigger/particle - execute unless data storage asset:context id.all{head:664,chest:665,legs:666,feet:667} positioned ~ ~0.6 ~ facing entity @s eyes rotated ~ 0 run function asset:artifact/0664.soul_fire_armor/trigger/particle - playsound block.fire.ambient player @a ~ ~ ~ 1.5 0.8 0 - playsound particle.soul_escape player @a ~ ~ ~ 2 0 0 - playsound minecraft:block.sculk_sensor.clicking player @a ~ ~ ~ 0.8 0 - playsound ogg:mob.vex.idle1 player @a ~ ~ ~ 1 0 0 - -# 物理耐性+5% - data modify storage api: Argument.UUID set value [I;1,1,666,4] - data modify storage api: Argument.Amount set value 0.05 - data modify storage api: Argument.Operation set value "multiply_base" - function api:modifier/attack/physical/add - -# 火耐性+10% - data modify storage api: Argument.UUID set value [I;1,1,666,4] - data modify storage api: Argument.Amount set value 0.1 - data modify storage api: Argument.Operation set value "multiply_base" - function api:modifier/defense/fire/add - -# 火攻撃+10% - data modify storage api: Argument.UUID set value [I;1,1,666,4] - data modify storage api: Argument.Amount set value 0.1 - data modify storage api: Argument.Operation set value "multiply_base" - function api:modifier/attack/fire/add - -# MP回復量+8% - data modify storage api: Argument.UUID set value [I;1,1,666,4] - data modify storage api: Argument.Amount set value 0.08 - data modify storage api: Argument.Operation set value "multiply_base" - function api:modifier/mp_regen/add - -# 最大体力-10% - attribute @s generic.max_health modifier add 00000001-0000-0001-0000-029a00000004 "MaxHealthDown" -0.1 multiply_base - -# 最大体力を反映するための即時回復 - effect give @s instant_health 1 0 - -# フルセット検知 - execute if data storage asset:context id.all{head:664,chest:665,legs:666,feet:667} run function asset:artifact/0664.soul_fire_armor/trigger/fullset/ \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0666.soul_fire_armor/trigger/dis_equip/main.mcfunction b/Asset/data/asset/functions/artifact/0666.soul_fire_armor/trigger/dis_equip/main.mcfunction index cfd6d52ed9..c497773901 100644 --- a/Asset/data/asset/functions/artifact/0666.soul_fire_armor/trigger/dis_equip/main.mcfunction +++ b/Asset/data/asset/functions/artifact/0666.soul_fire_armor/trigger/dis_equip/main.mcfunction @@ -4,31 +4,13 @@ # # @within function asset:artifact/0666.soul_fire_armor/trigger/dis_equip/ +# 装備部位数を取得 + data modify storage api: Argument.ID set value 232 + function api:entity/mob/effect/get/from_id + # 演出 - execute if entity @s[tag=!IG.Fullset] positioned ~ ~0.4 ~ run function asset:artifact/0664.soul_fire_armor/trigger/particle2 - execute if entity @s[tag=!IG.Fullset] positioned ~ ~0.6 ~ run function asset:artifact/0664.soul_fire_armor/trigger/particle2 + execute unless data storage api: Return.Effect{Stack:4} positioned ~ ~0.4 ~ run function asset:artifact/0664.soul_fire_armor/trigger/dis_equip/particle + execute unless data storage api: Return.Effect{Stack:4} positioned ~ ~0.6 ~ run function asset:artifact/0664.soul_fire_armor/trigger/dis_equip/particle playsound block.fire.ambient player @a ~ ~ ~ 1.5 0.8 0 playsound particle.soul_escape player @a ~ ~ ~ 2 0 0 playsound ogg:mob.vex.idle1 player @a ~ ~ ~ 1 0 0 - -# 物理耐性 - data modify storage api: Argument.UUID set value [I;1,1,666,4] - function api:modifier/attack/physical/remove - -# 火耐性 - data modify storage api: Argument.UUID set value [I;1,1,666,4] - function api:modifier/defense/fire/remove - -# 火攻撃 - data modify storage api: Argument.UUID set value [I;1,1,666,4] - function api:modifier/attack/fire/remove - -# MP回復量 - data modify storage api: Argument.UUID set value [I;1,1,666,4] - function api:modifier/mp_regen/remove - -# 最大体力-10% - attribute @s generic.max_health modifier remove 00000001-0000-0001-0000-029a00000004 - -# フルセット解除 - execute if entity @s[tag=IG.Fullset] run function asset:artifact/0664.soul_fire_armor/trigger/fullset/fullset_dis_equip \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0666.soul_fire_armor/trigger/1.trigger.mcfunction b/Asset/data/asset/functions/artifact/0666.soul_fire_armor/trigger/equip/1.trigger.mcfunction similarity index 70% rename from Asset/data/asset/functions/artifact/0666.soul_fire_armor/trigger/1.trigger.mcfunction rename to Asset/data/asset/functions/artifact/0666.soul_fire_armor/trigger/equip/1.trigger.mcfunction index b5102e0707..f5cf39b80c 100644 --- a/Asset/data/asset/functions/artifact/0666.soul_fire_armor/trigger/1.trigger.mcfunction +++ b/Asset/data/asset/functions/artifact/0666.soul_fire_armor/trigger/equip/1.trigger.mcfunction @@ -1,8 +1,8 @@ -#> asset:artifact/0666.soul_fire_armor/trigger/1.trigger +#> asset:artifact/0666.soul_fire_armor/trigger/equip/1.trigger # # 指定したイベントタイミングで実行されるfunction # # @within tag/function asset:artifact/** # storage asset:idのlegsに装備している神器のIDが入っているので比較し、~/2.check_condition.mcfunctionを実行する - execute if data storage asset:context id{legs:666} run function asset:artifact/0666.soul_fire_armor/trigger/2.check_condition \ No newline at end of file + execute if data storage asset:context id{legs:666} run function asset:artifact/0666.soul_fire_armor/trigger/equip/2.check_condition diff --git a/Asset/data/asset/functions/artifact/0666.soul_fire_armor/trigger/2.check_condition.mcfunction b/Asset/data/asset/functions/artifact/0666.soul_fire_armor/trigger/equip/2.check_condition.mcfunction similarity index 67% rename from Asset/data/asset/functions/artifact/0666.soul_fire_armor/trigger/2.check_condition.mcfunction rename to Asset/data/asset/functions/artifact/0666.soul_fire_armor/trigger/equip/2.check_condition.mcfunction index 22a320a233..5d2b32c767 100644 --- a/Asset/data/asset/functions/artifact/0666.soul_fire_armor/trigger/2.check_condition.mcfunction +++ b/Asset/data/asset/functions/artifact/0666.soul_fire_armor/trigger/equip/2.check_condition.mcfunction @@ -1,12 +1,12 @@ -#> asset:artifact/0666.soul_fire_armor/trigger/2.check_condition +#> asset:artifact/0666.soul_fire_armor/trigger/equip/2.check_condition # # 神器の発動条件をチェックします # -# @within function asset:artifact/0666.soul_fire_armor/trigger/1.trigger +# @within function asset:artifact/0666.soul_fire_armor/trigger/equip/1.trigger # 神器の基本的な条件の確認を行うfunction、成功している場合CanUsedタグが付く function asset:artifact/common/check_condition/legs # 他にアイテム等確認する場合はここに書く - + # CanUsedタグをチェックして3.main.mcfunctionを実行する - execute if entity @s[tag=CanUsed] run function asset:artifact/0666.soul_fire_armor/trigger/3.main \ No newline at end of file + execute if entity @s[tag=CanUsed] run function asset:artifact/0666.soul_fire_armor/trigger/equip/3.main diff --git a/Asset/data/asset/functions/artifact/0666.soul_fire_armor/trigger/equip/3.main.mcfunction b/Asset/data/asset/functions/artifact/0666.soul_fire_armor/trigger/equip/3.main.mcfunction new file mode 100644 index 0000000000..14e639cb0d --- /dev/null +++ b/Asset/data/asset/functions/artifact/0666.soul_fire_armor/trigger/equip/3.main.mcfunction @@ -0,0 +1,22 @@ +#> asset:artifact/0666.soul_fire_armor/trigger/equip/3.main +# +# 神器のメイン処理部 +# +# @within function asset:artifact/0666.soul_fire_armor/trigger/equip/2.check_condition + +# 基本的な使用時の処理(MP消費や使用回数の処理など)を行う + function asset:artifact/common/use/legs + +# ここから先は神器側の効果の処理を書く + +# 装備部位数を取得 + data modify storage api: Argument.ID set value 232 + function api:entity/mob/effect/get/from_id + +# 演出 + execute unless data storage api: Return.Effect{Stack:4} positioned ~ ~0.4 ~ run function asset:artifact/0664.soul_fire_armor/trigger/equip/4.particle + execute unless data storage api: Return.Effect{Stack:4} positioned ~ ~0.6 ~ run function asset:artifact/0664.soul_fire_armor/trigger/equip/4.particle + playsound block.fire.ambient player @a ~ ~ ~ 1.5 0.8 0 + playsound particle.soul_escape player @a ~ ~ ~ 2 0 0 + playsound minecraft:block.sculk_sensor.clicking player @a ~ ~ ~ 0.8 0 + playsound ogg:mob.vex.idle1 player @a ~ ~ ~ 1 0 0 diff --git a/Asset/data/asset/functions/artifact/0667.soul_fire_armor/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0667.soul_fire_armor/give/2.give.mcfunction index 2ba30d4410..3a57438a04 100644 --- a/Asset/data/asset/functions/artifact/0667.soul_fire_armor/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0667.soul_fire_armor/give/2.give.mcfunction @@ -15,7 +15,7 @@ # 神器の名前 (TextComponentString) data modify storage asset:artifact Name set value '{"text":"魂炎纏","color":"#01A7AC","bold":true}' # 神器の説明文 (TextComponentString[]) - data modify storage asset:artifact Lore set value ['[{"text":"物理攻撃+5% ","color":"dark_green"},{"text":"火耐性+10% 火攻撃+10% ","color":"red"}]','[{"text":"MP回復量+8% ","color":"green"},{"text":"最大体力-10%","color":"dark_red"}]','{"text":"魂炎を纏う者に代償を。","color":"#017C80","italic":true}','{"text":"代償背負いし者へ力を。","color":"#017C80","italic":true}'] + data modify storage asset:artifact Lore set value ['{"text":"魂炎を纏う者に代償を。","color":"#017C80","italic":true}','{"text":"代償背負いし者へ力を。","color":"#017C80","italic":true}'] # MP以外の消費物 (TextComponentString) (オプション) # data modify storage asset:artifact CostText set value # 使用回数 (int) (オプション) @@ -23,19 +23,19 @@ # 神器を発動できるスロット (string) Wikiを参照 data modify storage asset:artifact Slot set value "feet" # 神器のトリガー (string) Wikiを参照 - data modify storage asset:artifact Trigger set value "equipping" + data modify storage asset:artifact Trigger set value "onAttack" # 神器の発動条件 (TextComponentString) (オプション) # data modify storage asset:artifact Condition set value # 攻撃に関する情報 -Damage量 (literal[]/literal) Wikiを参照 (オプション) - # data modify storage asset:artifact AttackInfo.Damage set value [0,0] + data modify storage asset:artifact AttackInfo.Damage set value 80 # 攻撃に関する情報 -攻撃タイプ (string[]) Wikiを参照 (オプション) - # data modify storage asset:artifact AttackInfo.AttackType set value [Physical,Magic] + data modify storage asset:artifact AttackInfo.AttackType set value [Physical] # 攻撃に関する情報 -攻撃属性 (string[]) Wikiを参照 (オプション) - # data modify storage asset:artifact AttackInfo.ElementType set value [Fire,Water,Thunder,None] + data modify storage asset:artifact AttackInfo.ElementType set value [Fire] # 攻撃に関する情報 -防御無視 (boolean) Wikiを参照 (オプション) # data modify storage asset:artifact AttackInfo.BypassResist set value # 攻撃に関する情報 -範囲攻撃 (string) Wikiを参照 (オプション) - # data modify storage asset:artifact AttackInfo.IsRangeAttack set value + data modify storage asset:artifact AttackInfo.IsRangeAttack set value "never" # 攻撃に関する情報 -攻撃範囲 (literal) Wikiを参照 (オプション) # data modify storage asset:artifact AttackInfo.AttackRange set value # MP消費量 (int) @@ -50,10 +50,14 @@ # data modify storage asset:artifact DisableCooldownMessage set value # MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション) # data modify storage asset:artifact DisableMPMessage set value +# セット装備のID (int) (オプション) + data modify storage asset:artifact EquipID set value 232 +# 装備時のステータス補正 (Component[]) (オプション) + data modify storage asset:artifact Modifiers set value [{Type:"maxHealth",Slot:"feet",Amount:-0.10d,Operation:"multiply_base"},{Type:"attackPhysical",Slot:"feet",Amount:0.05d,Operation:"multiply_base"},{Type:"attackFire",Slot:"feet",Amount:0.10d,Operation:"multiply_base"},{Type:"defenseFire",Slot:"feet",Amount:0.10d,Operation:"multiply_base"},{Type:"mpRegen",Slot:"feet",Amount:0.08d,Operation:"multiply_base"}] # 扱える神 (string[]) Wikiを参照 data modify storage asset:artifact CanUsedGod set value ["Urban", "Nyaptov", "Rumor"] # カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) - data modify storage asset:artifact CustomNBT set value {HideFlags:68,display:{color:3071974},Unbreakable:1b,AttributeModifiers:[{AttributeName:"generic.armor",Name:"generic.armor",Amount:5,Operation:0,UUID:[I;1,1,667,3],Slot:"feet"},{AttributeName:"generic.armor_toughness",Name:"generic.armor_toughness",Amount:2.5,Operation:0,UUID:[I;1,1,667,3],Slot:"feet"}]} + data modify storage asset:artifact CustomNBT set value {HideFlags:196,display:{color:3071974},Trim:{material:"diamond",pattern:"tsb_armor:664"},Unbreakable:1b,AttributeModifiers:[{AttributeName:"generic.armor",Name:"generic.armor",Amount:5,Operation:0,UUID:[I;1,1,664,6],Slot:"feet"},{AttributeName:"generic.armor_toughness",Name:"generic.armor_toughness",Amount:2.5,Operation:0,UUID:[I;1,1,664,6],Slot:"feet"}]} # 神器の入手用function function asset:artifact/common/give diff --git a/Asset/data/asset/functions/artifact/0667.soul_fire_armor/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0667.soul_fire_armor/trigger/3.main.mcfunction deleted file mode 100644 index c756fc3933..0000000000 --- a/Asset/data/asset/functions/artifact/0667.soul_fire_armor/trigger/3.main.mcfunction +++ /dev/null @@ -1,50 +0,0 @@ -#> asset:artifact/0667.soul_fire_armor/trigger/3.main -# -# 神器のメイン処理部 -# -# @within function asset:artifact/0667.soul_fire_armor/trigger/2.check_condition - -# 基本的な使用時の処理(MP消費や使用回数の処理など)を行う - function asset:artifact/common/use/feet - -# ここから先は神器側の効果の処理を書く - -# 演出 - execute unless data storage asset:context id.all{head:664,chest:665,legs:666,feet:667} positioned ~ ~0.2 ~ facing entity @s eyes rotated ~ 0 run function asset:artifact/0664.soul_fire_armor/trigger/particle - playsound block.fire.ambient player @a ~ ~ ~ 1.5 0.8 0 - playsound particle.soul_escape player @a ~ ~ ~ 2 0 0 - playsound block.sculk_sensor.clicking player @a ~ ~ ~ 0.8 0 0 - playsound ogg:mob.vex.idle1 player @a ~ ~ ~ 1 0 0 - -# 物理攻撃+5% - data modify storage api: Argument.UUID set value [I;1,1,667,3] - data modify storage api: Argument.Amount set value 0.05 - data modify storage api: Argument.Operation set value "multiply_base" - function api:modifier/attack/physical/add - -# 火耐性+10% - data modify storage api: Argument.UUID set value [I;1,1,667,3] - data modify storage api: Argument.Amount set value 0.1 - data modify storage api: Argument.Operation set value "multiply_base" - function api:modifier/defense/fire/add - -# 火攻撃+10% - data modify storage api: Argument.UUID set value [I;1,1,667,3] - data modify storage api: Argument.Amount set value 0.1 - data modify storage api: Argument.Operation set value "multiply_base" - function api:modifier/attack/fire/add - -# MP回復量+8% - data modify storage api: Argument.UUID set value [I;1,1,667,3] - data modify storage api: Argument.Amount set value 0.08 - data modify storage api: Argument.Operation set value "multiply_base" - function api:modifier/mp_regen/add - -# 最大体力-10% - attribute @s generic.max_health modifier add 00000001-0000-0001-0000-029b00000003 "MaxHealthDown" -0.1 multiply_base - -# 最大体力を反映するための即時回復 - effect give @s instant_health 1 0 - -# フルセット検知 - execute if data storage asset:context id.all{head:664,chest:665,legs:666,feet:667} run function asset:artifact/0664.soul_fire_armor/trigger/fullset/ \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0667.soul_fire_armor/trigger/dis_equip/main.mcfunction b/Asset/data/asset/functions/artifact/0667.soul_fire_armor/trigger/dis_equip/main.mcfunction index f147d9602f..2a74f71039 100644 --- a/Asset/data/asset/functions/artifact/0667.soul_fire_armor/trigger/dis_equip/main.mcfunction +++ b/Asset/data/asset/functions/artifact/0667.soul_fire_armor/trigger/dis_equip/main.mcfunction @@ -4,30 +4,12 @@ # # @within function asset:artifact/0667.soul_fire_armor/trigger/dis_equip/ +# 装備部位数を取得 + data modify storage api: Argument.ID set value 232 + function api:entity/mob/effect/get/from_id + # 演出 - execute if entity @s[tag=!IG.Fullset] positioned ~ ~0.2 ~ run function asset:artifact/0664.soul_fire_armor/trigger/particle2 + execute unless data storage api: Return.Effect{Stack:4} positioned ~ ~0.2 ~ run function asset:artifact/0664.soul_fire_armor/trigger/dis_equip/particle playsound block.fire.ambient player @a ~ ~ ~ 1.5 0.8 0 playsound particle.soul_escape player @a ~ ~ ~ 2 0 0 playsound ogg:mob.vex.idle1 player @a ~ ~ ~ 1 0 0 - -# 物理攻撃 - data modify storage api: Argument.UUID set value [I;1,1,667,3] - function api:modifier/attack/physical/remove - -# 火耐性 - data modify storage api: Argument.UUID set value [I;1,1,667,3] - function api:modifier/defense/fire/remove - -# 火攻撃 - data modify storage api: Argument.UUID set value [I;1,1,667,3] - function api:modifier/attack/fire/remove - -# MP回復 - data modify storage api: Argument.UUID set value [I;1,1,667,3] - function api:modifier/mp_regen/remove - -# 最大体力 - attribute @s generic.max_health modifier remove 00000001-0000-0001-0000-029b00000003 - -# フルセット解除 - execute if entity @s[tag=IG.Fullset] run function asset:artifact/0664.soul_fire_armor/trigger/fullset/fullset_dis_equip \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0667.soul_fire_armor/trigger/1.trigger.mcfunction b/Asset/data/asset/functions/artifact/0667.soul_fire_armor/trigger/equip/1.trigger.mcfunction similarity index 70% rename from Asset/data/asset/functions/artifact/0667.soul_fire_armor/trigger/1.trigger.mcfunction rename to Asset/data/asset/functions/artifact/0667.soul_fire_armor/trigger/equip/1.trigger.mcfunction index b63430830e..b05f4bcbf4 100644 --- a/Asset/data/asset/functions/artifact/0667.soul_fire_armor/trigger/1.trigger.mcfunction +++ b/Asset/data/asset/functions/artifact/0667.soul_fire_armor/trigger/equip/1.trigger.mcfunction @@ -1,8 +1,8 @@ -#> asset:artifact/0667.soul_fire_armor/trigger/1.trigger +#> asset:artifact/0667.soul_fire_armor/trigger/equip/1.trigger # # 指定したイベントタイミングで実行されるfunction # # @within tag/function asset:artifact/** # storage asset:idのfeetに装備している神器のIDが入っているので比較し、~/2.check_condition.mcfunctionを実行する - execute if data storage asset:context id{feet:667} run function asset:artifact/0667.soul_fire_armor/trigger/2.check_condition \ No newline at end of file + execute if data storage asset:context id{feet:667} run function asset:artifact/0667.soul_fire_armor/trigger/equip/2.check_condition diff --git a/Asset/data/asset/functions/artifact/0667.soul_fire_armor/trigger/2.check_condition.mcfunction b/Asset/data/asset/functions/artifact/0667.soul_fire_armor/trigger/equip/2.check_condition.mcfunction similarity index 67% rename from Asset/data/asset/functions/artifact/0667.soul_fire_armor/trigger/2.check_condition.mcfunction rename to Asset/data/asset/functions/artifact/0667.soul_fire_armor/trigger/equip/2.check_condition.mcfunction index b216b50269..36c518cd8b 100644 --- a/Asset/data/asset/functions/artifact/0667.soul_fire_armor/trigger/2.check_condition.mcfunction +++ b/Asset/data/asset/functions/artifact/0667.soul_fire_armor/trigger/equip/2.check_condition.mcfunction @@ -1,12 +1,12 @@ -#> asset:artifact/0667.soul_fire_armor/trigger/2.check_condition +#> asset:artifact/0667.soul_fire_armor/trigger/equip/2.check_condition # # 神器の発動条件をチェックします # -# @within function asset:artifact/0667.soul_fire_armor/trigger/1.trigger +# @within function asset:artifact/0667.soul_fire_armor/trigger/equip/1.trigger # 神器の基本的な条件の確認を行うfunction、成功している場合CanUsedタグが付く function asset:artifact/common/check_condition/feet # 他にアイテム等確認する場合はここに書く - + # CanUsedタグをチェックして3.main.mcfunctionを実行する - execute if entity @s[tag=CanUsed] run function asset:artifact/0667.soul_fire_armor/trigger/3.main \ No newline at end of file + execute if entity @s[tag=CanUsed] run function asset:artifact/0667.soul_fire_armor/trigger/equip/3.main diff --git a/Asset/data/asset/functions/artifact/0667.soul_fire_armor/trigger/equip/3.main.mcfunction b/Asset/data/asset/functions/artifact/0667.soul_fire_armor/trigger/equip/3.main.mcfunction new file mode 100644 index 0000000000..2710f47ea3 --- /dev/null +++ b/Asset/data/asset/functions/artifact/0667.soul_fire_armor/trigger/equip/3.main.mcfunction @@ -0,0 +1,21 @@ +#> asset:artifact/0667.soul_fire_armor/trigger/equip/3.main +# +# 神器のメイン処理部 +# +# @within function asset:artifact/0667.soul_fire_armor/trigger/equip/2.check_condition + +# 基本的な使用時の処理(MP消費や使用回数の処理など)を行う + function asset:artifact/common/use/feet + +# ここから先は神器側の効果の処理を書く + +# 装備部位数を取得 + data modify storage api: Argument.ID set value 232 + function api:entity/mob/effect/get/from_id + +# 演出 + execute unless data storage api: Return.Effect{Stack:4} positioned ~ ~0.2 ~ run function asset:artifact/0664.soul_fire_armor/trigger/equip/4.particle + playsound block.fire.ambient player @a ~ ~ ~ 1.5 0.8 0 + playsound particle.soul_escape player @a ~ ~ ~ 2 0 0 + playsound minecraft:block.sculk_sensor.clicking player @a ~ ~ ~ 0.8 0 + playsound ogg:mob.vex.idle1 player @a ~ ~ ~ 1 0 0 diff --git a/Asset/data/asset/functions/artifact/0690.steam_core/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0690.steam_core/give/2.give.mcfunction index 8dcf811952..3f3cfb2194 100644 --- a/Asset/data/asset/functions/artifact/0690.steam_core/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0690.steam_core/give/2.give.mcfunction @@ -15,7 +15,7 @@ # 神器の名前 (TextComponentString) data modify storage asset:artifact Name set value '{"text":"スチームコア","color":"#BF675A","bold":true}' # 神器の説明文 (TextComponentString[]) - data modify storage asset:artifact Lore set value ['[{"text":"火攻撃+15% ","color":"red"},{"text":"水攻撃+15% ","color":"aqua"},{"text":"被回復量-15%","color":"dark_red"}]','[{"text":"凄まじい効率を誇る蒸気機関の鎧。","color":"gray"}]','[{"text":"着用すると蒸気が体中から溢れてくる。","color":"gray"}]'] + data modify storage asset:artifact Lore set value ['[{"text":"凄まじい効率を誇る蒸気機関の鎧。","color":"gray"}]','[{"text":"着用すると蒸気が体中から溢れてくる。","color":"gray"}]'] # MP以外の消費物 (TextComponentString) (オプション) # data modify storage asset:artifact CostText set value # 使用回数 (int) (オプション) @@ -50,6 +50,10 @@ # data modify storage asset:artifact DisableCooldownMessage set value # MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション) # data modify storage asset:artifact DisableMPMessage set value +# セット装備のID (int) (オプション) + # data modify storage asset:artifact EquipID set value +# 装備時のステータス効果 (Component[]) (オプション) + data modify storage asset:artifact Modifiers set value [{Type:"attackFire",Slot:"chest",Amount:0.15d,Operation:"multiply_base"},{Type:"attackWater",Slot:"chest",Amount:0.15d,Operation:"multiply_base"},{Type:"receiveHeal",Slot:"chest",Amount:-0.15d,Operation:"multiply_base"}] # 扱える神 (string[]) Wikiを参照 data modify storage asset:artifact CanUsedGod set value ["Urban", "Rumor"] # カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) diff --git a/Asset/data/asset/functions/artifact/0690.steam_core/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0690.steam_core/trigger/3.main.mcfunction index 41150c0728..95803eb545 100644 --- a/Asset/data/asset/functions/artifact/0690.steam_core/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/0690.steam_core/trigger/3.main.mcfunction @@ -15,21 +15,3 @@ playsound block.fire.extinguish player @a ~ ~ ~ 0.5 0.7 0 playsound block.fire.extinguish player @a ~ ~ ~ 0.5 0.9 0 playsound block.fire.extinguish player @a ~ ~ ~ 0.5 1.1 0 - -# 火攻撃+15% - data modify storage api: Argument.UUID set value [I;1,1,690,5] - data modify storage api: Argument.Amount set value 0.15 - data modify storage api: Argument.Operation set value "multiply_base" - function api:modifier/attack/fire/add - -# 水攻撃+15% - data modify storage api: Argument.UUID set value [I;1,1,690,5] - data modify storage api: Argument.Amount set value 0.15 - data modify storage api: Argument.Operation set value "multiply_base" - function api:modifier/attack/water/add - -# 被回復量-15% - data modify storage api: Argument.UUID set value [I;1,1,690,5] - data modify storage api: Argument.Amount set value -0.15 - data modify storage api: Argument.Operation set value "multiply_base" - function api:modifier/receive_heal/add \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0690.steam_core/trigger/dis_equip/.mcfunction b/Asset/data/asset/functions/artifact/0690.steam_core/trigger/dis_equip/.mcfunction deleted file mode 100644 index 202219d0d6..0000000000 --- a/Asset/data/asset/functions/artifact/0690.steam_core/trigger/dis_equip/.mcfunction +++ /dev/null @@ -1,7 +0,0 @@ -#> asset:artifact/0690.steam_core/trigger/dis_equip/ -# -# 装備を外した時に外した部位にのみのidが入った状態でトリガーされる -# -# @within tag/function asset:artifact/dis_equip - -execute if data storage asset:context id{chest:690} run function asset:artifact/0690.steam_core/trigger/dis_equip/main \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0690.steam_core/trigger/dis_equip/main.mcfunction b/Asset/data/asset/functions/artifact/0690.steam_core/trigger/dis_equip/main.mcfunction deleted file mode 100644 index 694ee391e8..0000000000 --- a/Asset/data/asset/functions/artifact/0690.steam_core/trigger/dis_equip/main.mcfunction +++ /dev/null @@ -1,19 +0,0 @@ -#> asset:artifact/0690.steam_core/trigger/dis_equip/main -# -# 装備を外した時のメイン処理 -# -# @within function asset:artifact/0690.steam_core/trigger/dis_equip/ - -# 補正削除 - -# 火攻撃 - data modify storage api: Argument.UUID set value [I;1,1,690,5] - function api:modifier/attack/fire/remove - -# 水攻撃 - data modify storage api: Argument.UUID set value [I;1,1,690,5] - function api:modifier/attack/water/remove - -# 被回復量 - data modify storage api: Argument.UUID set value [I;1,1,690,5] - function api:modifier/receive_heal/remove \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0703.wizard_hat/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0703.wizard_hat/give/2.give.mcfunction index 1a0f14d7bd..aecf7dbd57 100644 --- a/Asset/data/asset/functions/artifact/0703.wizard_hat/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0703.wizard_hat/give/2.give.mcfunction @@ -15,7 +15,7 @@ # 神器の名前 (TextComponentString) data modify storage asset:artifact Name set value '{"text":"魔法使いの帽子","color":"#9C2DFC"}' # 神器の説明文 (TextComponentString[]) - data modify storage asset:artifact Lore set value ['[{"text":"魔法耐性+2.5% 魔法攻撃+2.5%","color":"dark_purple"}]','[{"text":"MP回復量+2.5%","color":"green"}]','[{"text":"物理耐性-2.5% 物理攻撃-2.5%","color":"dark_red"}]','[{"text":"魔法使いが普段身に着けている帽子。","color":"gray"}]'] + data modify storage asset:artifact Lore set value ['[{"text":"魔法使いが普段身に着けている帽子。","color":"gray"}]'] # MP以外の消費物 (TextComponentString) (オプション) # data modify storage asset:artifact CostText set value # 使用回数 (int) (オプション) @@ -50,6 +50,10 @@ # data modify storage asset:artifact DisableCooldownMessage set value # MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション) # data modify storage asset:artifact DisableMPMessage set value +# セット装備のID (int) (オプション) + # data modify storage asset:artifact EquipID set value +# 装備時のステータス補正 (Component[]) (オプション) + data modify storage asset:artifact Modifiers set value [{Type:"attackMagic",Slot:"head",Amount:0.025d,Operation:"multiply_base"},{Type:"defenseMagic",Slot:"head",Amount:0.025d,Operation:"multiply_base"},{Type:"mpRegen",Slot:"head",Amount:0.025d,Operation:"multiply_base"},{Type:"attackPhysical",Slot:"head",Amount:-0.025d,Operation:"multiply_base"},{Type:"defensePhysical",Slot:"head",Amount:-0.025d,Operation:"multiply_base"}] # 扱える神 (string[]) Wikiを参照 data modify storage asset:artifact CanUsedGod set value ["Flora", "Nyaptov", "Wi-ki", "Rumor"] # カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) diff --git a/Asset/data/asset/functions/artifact/0703.wizard_hat/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0703.wizard_hat/trigger/3.main.mcfunction index 13f09f10a5..68a8284892 100644 --- a/Asset/data/asset/functions/artifact/0703.wizard_hat/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/0703.wizard_hat/trigger/3.main.mcfunction @@ -9,36 +9,6 @@ # ここから先は神器側の効果の処理を書く -# 魔法耐性+2.5% - data modify storage api: Argument.UUID set value [I;1,1,703,6] - data modify storage api: Argument.Amount set value 0.025 - data modify storage api: Argument.Operation set value "multiply_base" - function api:modifier/defense/magic/add - -# 魔法攻撃量+2.5% - data modify storage api: Argument.UUID set value [I;1,1,703,6] - data modify storage api: Argument.Amount set value 0.025 - data modify storage api: Argument.Operation set value "multiply_base" - function api:modifier/attack/magic/add - -# MP回復量+2.5% - data modify storage api: Argument.UUID set value [I;1,1,703,6] - data modify storage api: Argument.Amount set value 0.025 - data modify storage api: Argument.Operation set value "multiply_base" - function api:modifier/mp_regen/add - -# 物理耐性-2.5% - data modify storage api: Argument.UUID set value [I;1,1,703,6] - data modify storage api: Argument.Amount set value -0.025 - data modify storage api: Argument.Operation set value "multiply_base" - function api:modifier/defense/physical/add - -# 物理攻撃-2.5% - data modify storage api: Argument.UUID set value [I;1,1,703,6] - data modify storage api: Argument.Amount set value -0.025 - data modify storage api: Argument.Operation set value "multiply_base" - function api:modifier/attack/physical/add - # 演出 particle witch ~ ~1.7 ~ 0.3 0.1 0.3 1 10 normal @a - playsound minecraft:block.enchantment_table.use player @a ~ ~ ~ 0.8 1 \ No newline at end of file + playsound minecraft:block.enchantment_table.use player @a ~ ~ ~ 0.8 1 diff --git a/Asset/data/asset/functions/artifact/0703.wizard_hat/trigger/dis_equip/.mcfunction b/Asset/data/asset/functions/artifact/0703.wizard_hat/trigger/dis_equip/.mcfunction deleted file mode 100644 index e623e36ece..0000000000 --- a/Asset/data/asset/functions/artifact/0703.wizard_hat/trigger/dis_equip/.mcfunction +++ /dev/null @@ -1,7 +0,0 @@ -#> asset:artifact/0703.wizard_hat/trigger/dis_equip/ -# -# 装備を外した時に外した部位にのみのidが入った状態でトリガーされる -# -# @within tag/function asset:artifact/dis_equip - -execute if data storage asset:context id{head:703} run function asset:artifact/0703.wizard_hat/trigger/dis_equip/main \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0703.wizard_hat/trigger/dis_equip/main.mcfunction b/Asset/data/asset/functions/artifact/0703.wizard_hat/trigger/dis_equip/main.mcfunction deleted file mode 100644 index f0cc7f6ffc..0000000000 --- a/Asset/data/asset/functions/artifact/0703.wizard_hat/trigger/dis_equip/main.mcfunction +++ /dev/null @@ -1,32 +0,0 @@ -#> asset:artifact/0703.wizard_hat/trigger/dis_equip/main -# -# 装備を外した時のメイン処理 -# -# @within function asset:artifact/0703.wizard_hat/trigger/dis_equip/ - -# 魔法ダメージ量、魔法耐性、MP回復量 物理耐性、物理攻撃の補正の削除 - -# UUID - data modify storage api: Argument.UUID set value [I;1,1,703,6] -# 補正の削除 - function api:modifier/defense/magic/remove - -# UUID - data modify storage api: Argument.UUID set value [I;1,1,703,6] -# 補正の削除 - function api:modifier/attack/magic/remove - -# UUID - data modify storage api: Argument.UUID set value [I;1,1,703,6] -# 補正の削除 - function api:modifier/mp_regen/remove - -# UUID - data modify storage api: Argument.UUID set value [I;1,1,703,6] -# 補正の削除 - function api:modifier/defense/physical/remove - -# UUID - data modify storage api: Argument.UUID set value [I;1,1,703,6] -# 補正の削除 - function api:modifier/attack/physical/remove diff --git a/Asset/data/asset/functions/artifact/0704.wizard_robe_upper/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0704.wizard_robe_upper/give/2.give.mcfunction index 9499c56346..0cef22b90f 100644 --- a/Asset/data/asset/functions/artifact/0704.wizard_robe_upper/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0704.wizard_robe_upper/give/2.give.mcfunction @@ -15,7 +15,7 @@ # 神器の名前 (TextComponentString) data modify storage asset:artifact Name set value '{"text":"魔法使いのローブ(上)","color":"#9C2DFC"}' # 神器の説明文 (TextComponentString[]) - data modify storage asset:artifact Lore set value ['[{"text":"魔法耐性+2.5% 魔法攻撃+2.5%","color":"dark_purple"}]','[{"text":"MP回復量+2.5%","color":"green"}]','[{"text":"物理耐性-2.5% 物理攻撃-2.5%","color":"dark_red"}]','[{"text":"魔法使いが普段身に着けているローブ。","color":"gray"}]'] + data modify storage asset:artifact Lore set value ['[{"text":"魔法使いが普段身に着けているローブ。","color":"gray"}]'] # MP以外の消費物 (TextComponentString) (オプション) # data modify storage asset:artifact CostText set value # 使用回数 (int) (オプション) @@ -50,6 +50,10 @@ # data modify storage asset:artifact DisableCooldownMessage set value # MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション) # data modify storage asset:artifact DisableMPMessage set value +# セット装備のID (int) (オプション) + # data modify storage asset:artifact EquipID set value +# 装備時のステータス補正 (Component[]) (オプション) + data modify storage asset:artifact Modifiers set value [{Type:"attackMagic",Slot:"chest",Amount:0.025d,Operation:"multiply_base"},{Type:"defenseMagic",Slot:"chest",Amount:0.025d,Operation:"multiply_base"},{Type:"mpRegen",Slot:"chest",Amount:0.025d,Operation:"multiply_base"},{Type:"attackPhysical",Slot:"chest",Amount:-0.025d,Operation:"multiply_base"},{Type:"defensePhysical",Slot:"chest",Amount:-0.025d,Operation:"multiply_base"}] # 扱える神 (string[]) Wikiを参照 data modify storage asset:artifact CanUsedGod set value ["Flora", "Nyaptov", "Wi-ki", "Rumor"] # カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) diff --git a/Asset/data/asset/functions/artifact/0704.wizard_robe_upper/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0704.wizard_robe_upper/trigger/3.main.mcfunction index d91282ad65..a53c6888f9 100644 --- a/Asset/data/asset/functions/artifact/0704.wizard_robe_upper/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/0704.wizard_robe_upper/trigger/3.main.mcfunction @@ -9,36 +9,6 @@ # ここから先は神器側の効果の処理を書く -# 魔法耐性+2.5% - data modify storage api: Argument.UUID set value [I;1,1,704,5] - data modify storage api: Argument.Amount set value 0.025 - data modify storage api: Argument.Operation set value "multiply_base" - function api:modifier/defense/magic/add - -# 魔法攻撃+2.5% - data modify storage api: Argument.UUID set value [I;1,1,704,5] - data modify storage api: Argument.Amount set value 0.025 - data modify storage api: Argument.Operation set value "multiply_base" - function api:modifier/attack/magic/add - -# MP回復量+2.5% - data modify storage api: Argument.UUID set value [I;1,1,704,5] - data modify storage api: Argument.Amount set value 0.025 - data modify storage api: Argument.Operation set value "multiply_base" - function api:modifier/mp_regen/add - -# 物理耐性-2.5% - data modify storage api: Argument.UUID set value [I;1,1,704,5] - data modify storage api: Argument.Amount set value -0.025 - data modify storage api: Argument.Operation set value "multiply_base" - function api:modifier/defense/physical/add - -# 物理攻撃-2.5% - data modify storage api: Argument.UUID set value [I;1,1,704,5] - data modify storage api: Argument.Amount set value -0.025 - data modify storage api: Argument.Operation set value "multiply_base" - function api:modifier/attack/physical/add - # 演出 particle witch ~ ~1.3 ~ 0.3 0.25 0.3 1 10 normal @a - playsound minecraft:block.enchantment_table.use player @a ~ ~ ~ 0.8 1 \ No newline at end of file + playsound minecraft:block.enchantment_table.use player @a ~ ~ ~ 0.8 1 diff --git a/Asset/data/asset/functions/artifact/0704.wizard_robe_upper/trigger/dis_equip/.mcfunction b/Asset/data/asset/functions/artifact/0704.wizard_robe_upper/trigger/dis_equip/.mcfunction deleted file mode 100644 index f89aa37e82..0000000000 --- a/Asset/data/asset/functions/artifact/0704.wizard_robe_upper/trigger/dis_equip/.mcfunction +++ /dev/null @@ -1,7 +0,0 @@ -#> asset:artifact/0704.wizard_robe_upper/trigger/dis_equip/ -# -# 装備を外した時に外した部位にのみのidが入った状態でトリガーされる -# -# @within tag/function asset:artifact/dis_equip - -execute if data storage asset:context id{chest:704} run function asset:artifact/0704.wizard_robe_upper/trigger/dis_equip/main \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0704.wizard_robe_upper/trigger/dis_equip/main.mcfunction b/Asset/data/asset/functions/artifact/0704.wizard_robe_upper/trigger/dis_equip/main.mcfunction deleted file mode 100644 index 7e8bd59b31..0000000000 --- a/Asset/data/asset/functions/artifact/0704.wizard_robe_upper/trigger/dis_equip/main.mcfunction +++ /dev/null @@ -1,32 +0,0 @@ -#> asset:artifact/0704.wizard_robe_upper/trigger/dis_equip/main -# -# 装備を外した時のメイン処理 -# -# @within function asset:artifact/0704.wizard_robe_upper/trigger/dis_equip/ - -# 魔法ダメージ量、魔法耐性、MP回復量 物理耐性、物理攻撃の補正の削除 - -# UUID - data modify storage api: Argument.UUID set value [I;1,1,704,5] -# 補正の削除 - function api:modifier/defense/magic/remove - -# UUID - data modify storage api: Argument.UUID set value [I;1,1,704,5] -# 補正の削除 - function api:modifier/attack/magic/remove - -# UUID - data modify storage api: Argument.UUID set value [I;1,1,704,5] -# 補正の削除 - function api:modifier/mp_regen/remove - -# UUID - data modify storage api: Argument.UUID set value [I;1,1,704,5] -# 補正の削除 - function api:modifier/defense/physical/remove - -# UUID - data modify storage api: Argument.UUID set value [I;1,1,704,5] -# 補正の削除 - function api:modifier/attack/physical/remove diff --git a/Asset/data/asset/functions/artifact/0705.wizard_robe_lower/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0705.wizard_robe_lower/give/2.give.mcfunction index 8397e64dc2..401959e0dd 100644 --- a/Asset/data/asset/functions/artifact/0705.wizard_robe_lower/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0705.wizard_robe_lower/give/2.give.mcfunction @@ -15,7 +15,7 @@ # 神器の名前 (TextComponentString) data modify storage asset:artifact Name set value '{"text":"魔法使いのローブ(下)","color":"#9C2DFC"}' # 神器の説明文 (TextComponentString[]) - data modify storage asset:artifact Lore set value ['[{"text":"魔法耐性+2.5% 魔法攻撃+2.5%","color":"dark_purple"}]','[{"text":"MP回復量+2.5%","color":"green"}]','[{"text":"物理耐性-2.5% 物理攻撃-2.5%","color":"dark_red"}]','[{"text":"魔法使いが普段身に着けているローブ。","color":"gray"}]'] + data modify storage asset:artifact Lore set value ['[{"text":"魔法使いが普段身に着けているローブ。","color":"gray"}]'] # MP以外の消費物 (TextComponentString) (オプション) # data modify storage asset:artifact CostText set value # 使用回数 (int) (オプション) @@ -50,6 +50,10 @@ # data modify storage asset:artifact DisableCooldownMessage set value # MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション) # data modify storage asset:artifact DisableMPMessage set value +# セット装備のID (int) (オプション) + # data modify storage asset:artifact EquipID set value +# 装備時のステータス補正 (Component[]) (オプション) + data modify storage asset:artifact Modifiers set value [{Type:"attackMagic",Slot:"legs",Amount:0.025d,Operation:"multiply_base"},{Type:"defenseMagic",Slot:"legs",Amount:0.025d,Operation:"multiply_base"},{Type:"mpRegen",Slot:"legs",Amount:0.025d,Operation:"multiply_base"},{Type:"attackPhysical",Slot:"legs",Amount:-0.025d,Operation:"multiply_base"},{Type:"defensePhysical",Slot:"legs",Amount:-0.025d,Operation:"multiply_base"}] # 扱える神 (string[]) Wikiを参照 data modify storage asset:artifact CanUsedGod set value ["Flora", "Nyaptov", "Wi-ki", "Rumor"] # カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) diff --git a/Asset/data/asset/functions/artifact/0705.wizard_robe_lower/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0705.wizard_robe_lower/trigger/3.main.mcfunction index ec10490fa7..a894ec831f 100644 --- a/Asset/data/asset/functions/artifact/0705.wizard_robe_lower/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/0705.wizard_robe_lower/trigger/3.main.mcfunction @@ -9,36 +9,6 @@ # ここから先は神器側の効果の処理を書く -# 魔法耐性+2.5% - data modify storage api: Argument.UUID set value [I;1,1,705,4] - data modify storage api: Argument.Amount set value 0.025 - data modify storage api: Argument.Operation set value "multiply_base" - function api:modifier/defense/magic/add - -# 魔法攻撃+2.5% - data modify storage api: Argument.UUID set value [I;1,1,705,4] - data modify storage api: Argument.Amount set value 0.025 - data modify storage api: Argument.Operation set value "multiply_base" - function api:modifier/attack/magic/add - -# MP回復量+2.5% - data modify storage api: Argument.UUID set value [I;1,1,705,4] - data modify storage api: Argument.Amount set value 0.025 - data modify storage api: Argument.Operation set value "multiply_base" - function api:modifier/mp_regen/add - -# 物理耐性-2.5% - data modify storage api: Argument.UUID set value [I;1,1,705,4] - data modify storage api: Argument.Amount set value -0.025 - data modify storage api: Argument.Operation set value "multiply_base" - function api:modifier/defense/physical/add - -# 物理攻撃-2.5% - data modify storage api: Argument.UUID set value [I;1,1,705,4] - data modify storage api: Argument.Amount set value -0.025 - data modify storage api: Argument.Operation set value "multiply_base" - function api:modifier/attack/physical/add - # 演出 particle witch ~ ~0.4 ~ 0.3 0.15 0.3 1 10 normal @a - playsound minecraft:block.enchantment_table.use player @a ~ ~ ~ 0.8 1 \ No newline at end of file + playsound minecraft:block.enchantment_table.use player @a ~ ~ ~ 0.8 1 diff --git a/Asset/data/asset/functions/artifact/0705.wizard_robe_lower/trigger/dis_equip/.mcfunction b/Asset/data/asset/functions/artifact/0705.wizard_robe_lower/trigger/dis_equip/.mcfunction deleted file mode 100644 index e7b0287a99..0000000000 --- a/Asset/data/asset/functions/artifact/0705.wizard_robe_lower/trigger/dis_equip/.mcfunction +++ /dev/null @@ -1,7 +0,0 @@ -#> asset:artifact/0705.wizard_robe_lower/trigger/dis_equip/ -# -# 装備を外した時に外した部位にのみのidが入った状態でトリガーされる -# -# @within tag/function asset:artifact/dis_equip - -execute if data storage asset:context id{legs:705} run function asset:artifact/0705.wizard_robe_lower/trigger/dis_equip/main \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0705.wizard_robe_lower/trigger/dis_equip/main.mcfunction b/Asset/data/asset/functions/artifact/0705.wizard_robe_lower/trigger/dis_equip/main.mcfunction deleted file mode 100644 index 38253afebd..0000000000 --- a/Asset/data/asset/functions/artifact/0705.wizard_robe_lower/trigger/dis_equip/main.mcfunction +++ /dev/null @@ -1,32 +0,0 @@ -#> asset:artifact/0705.wizard_robe_lower/trigger/dis_equip/main -# -# 装備を外した時のメイン処理 -# -# @within function asset:artifact/0705.wizard_robe_lower/trigger/dis_equip/ - -# 魔法ダメージ量、魔法耐性、MP回復量 物理耐性、物理攻撃の補正の削除 - -# UUID - data modify storage api: Argument.UUID set value [I;1,1,705,4] -# 補正の削除 - function api:modifier/defense/magic/remove - -# UUID - data modify storage api: Argument.UUID set value [I;1,1,705,4] -# 補正の削除 - function api:modifier/attack/magic/remove - -# UUID - data modify storage api: Argument.UUID set value [I;1,1,705,4] -# 補正の削除 - function api:modifier/mp_regen/remove - -# UUID - data modify storage api: Argument.UUID set value [I;1,1,705,4] -# 補正の削除 - function api:modifier/defense/physical/remove - -# UUID - data modify storage api: Argument.UUID set value [I;1,1,705,4] -# 補正の削除 - function api:modifier/attack/physical/remove diff --git a/Asset/data/asset/functions/artifact/0706.wizard_boots/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0706.wizard_boots/give/2.give.mcfunction index 3abc173121..b2c22034de 100644 --- a/Asset/data/asset/functions/artifact/0706.wizard_boots/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0706.wizard_boots/give/2.give.mcfunction @@ -15,7 +15,7 @@ # 神器の名前 (TextComponentString) data modify storage asset:artifact Name set value '{"text":"魔法使いの靴","color":"#9C2DFC"}' # 神器の説明文 (TextComponentString[]) - data modify storage asset:artifact Lore set value ['[{"text":"魔法耐性+2.5% 魔法攻撃+2.5%","color":"dark_purple"}]','[{"text":"MP回復量+2.5%","color":"green"}]','[{"text":"物理耐性-2.5% 物理攻撃-2.5%","color":"dark_red"}]','[{"text":"魔法使いが普段身に着けている靴。","color":"gray"}]'] + data modify storage asset:artifact Lore set value ['[{"text":"魔法使いが普段身に着けている靴。","color":"gray"}]'] # MP以外の消費物 (TextComponentString) (オプション) # data modify storage asset:artifact CostText set value # 使用回数 (int) (オプション) @@ -50,6 +50,10 @@ # data modify storage asset:artifact DisableCooldownMessage set value # MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション) # data modify storage asset:artifact DisableMPMessage set value +# セット装備のID (int) (オプション) + # data modify storage asset:artifact EquipID set value +# 装備時のステータス補正 (Component[]) (オプション) + data modify storage asset:artifact Modifiers set value [{Type:"attackMagic",Slot:"feet",Amount:0.025d,Operation:"multiply_base"},{Type:"defenseMagic",Slot:"feet",Amount:0.025d,Operation:"multiply_base"},{Type:"mpRegen",Slot:"feet",Amount:0.025d,Operation:"multiply_base"},{Type:"attackPhysical",Slot:"feet",Amount:-0.025d,Operation:"multiply_base"},{Type:"defensePhysical",Slot:"feet",Amount:-0.025d,Operation:"multiply_base"}] # 扱える神 (string[]) Wikiを参照 data modify storage asset:artifact CanUsedGod set value ["Flora", "Nyaptov", "Wi-ki", "Rumor"] # カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) diff --git a/Asset/data/asset/functions/artifact/0706.wizard_boots/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0706.wizard_boots/trigger/3.main.mcfunction index c0c30991bc..60937ef2ff 100644 --- a/Asset/data/asset/functions/artifact/0706.wizard_boots/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/0706.wizard_boots/trigger/3.main.mcfunction @@ -9,36 +9,6 @@ # ここから先は神器側の効果の処理を書く -# 魔法耐性+2.5% - data modify storage api: Argument.UUID set value [I;1,1,706,3] - data modify storage api: Argument.Amount set value 0.025 - data modify storage api: Argument.Operation set value "multiply_base" - function api:modifier/defense/magic/add - -# 魔法攻撃+2.5% - data modify storage api: Argument.UUID set value [I;1,1,706,3] - data modify storage api: Argument.Amount set value 0.025 - data modify storage api: Argument.Operation set value "multiply_base" - function api:modifier/attack/magic/add - -# MP回復量+2.5% - data modify storage api: Argument.UUID set value [I;1,1,706,3] - data modify storage api: Argument.Amount set value 0.025 - data modify storage api: Argument.Operation set value "multiply_base" - function api:modifier/mp_regen/add - -# 物理耐性-2.5% - data modify storage api: Argument.UUID set value [I;1,1,706,3] - data modify storage api: Argument.Amount set value -0.025 - data modify storage api: Argument.Operation set value "multiply_base" - function api:modifier/defense/physical/add - -# 物理攻撃-2.5% - data modify storage api: Argument.UUID set value [I;1,1,706,3] - data modify storage api: Argument.Amount set value -0.025 - data modify storage api: Argument.Operation set value "multiply_base" - function api:modifier/attack/physical/add - # 演出 particle witch ~ ~0.3 ~ 0.3 0.1 0.3 1 10 normal @a - playsound minecraft:block.enchantment_table.use player @a ~ ~ ~ 0.8 1 \ No newline at end of file + playsound minecraft:block.enchantment_table.use player @a ~ ~ ~ 0.8 1 diff --git a/Asset/data/asset/functions/artifact/0706.wizard_boots/trigger/dis_equip/.mcfunction b/Asset/data/asset/functions/artifact/0706.wizard_boots/trigger/dis_equip/.mcfunction deleted file mode 100644 index eb6a7f42dc..0000000000 --- a/Asset/data/asset/functions/artifact/0706.wizard_boots/trigger/dis_equip/.mcfunction +++ /dev/null @@ -1,7 +0,0 @@ -#> asset:artifact/0706.wizard_boots/trigger/dis_equip/ -# -# 装備を外した時に外した部位にのみのidが入った状態でトリガーされる -# -# @within tag/function asset:artifact/dis_equip - -execute if data storage asset:context id{feet:706} run function asset:artifact/0706.wizard_boots/trigger/dis_equip/main \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0706.wizard_boots/trigger/dis_equip/main.mcfunction b/Asset/data/asset/functions/artifact/0706.wizard_boots/trigger/dis_equip/main.mcfunction deleted file mode 100644 index dea72f1741..0000000000 --- a/Asset/data/asset/functions/artifact/0706.wizard_boots/trigger/dis_equip/main.mcfunction +++ /dev/null @@ -1,32 +0,0 @@ -#> asset:artifact/0706.wizard_boots/trigger/dis_equip/main -# -# 装備を外した時のメイン処理 -# -# @within function asset:artifact/0706.wizard_boots/trigger/dis_equip/ - -# 魔法ダメージ量、魔法耐性、MP回復量 物理耐性、物理攻撃の補正の削除 - -# UUID - data modify storage api: Argument.UUID set value [I;1,1,706,3] -# 補正の削除 - function api:modifier/defense/magic/remove - -# UUID - data modify storage api: Argument.UUID set value [I;1,1,706,3] -# 補正の削除 - function api:modifier/attack/magic/remove - -# UUID - data modify storage api: Argument.UUID set value [I;1,1,706,3] -# 補正の削除 - function api:modifier/mp_regen/remove - -# UUID - data modify storage api: Argument.UUID set value [I;1,1,706,3] -# 補正の削除 - function api:modifier/defense/physical/remove - -# UUID - data modify storage api: Argument.UUID set value [I;1,1,706,3] -# 補正の削除 - function api:modifier/attack/physical/remove diff --git a/Asset/data/asset/functions/artifact/0707.mage_hat/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0707.mage_hat/give/2.give.mcfunction index 92c4b3263e..392f4bec0a 100644 --- a/Asset/data/asset/functions/artifact/0707.mage_hat/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0707.mage_hat/give/2.give.mcfunction @@ -15,7 +15,7 @@ # 神器の名前 (TextComponentString) data modify storage asset:artifact Name set value '{"text":"魔導士の帽子","color":"#621B9E"}' # 神器の説明文 (TextComponentString[]) - data modify storage asset:artifact Lore set value ['[{"text":"魔法耐性+5% 魔法攻撃+5%","color":"dark_purple"}]','[{"text":"MP回復量+5%","color":"green"}]','[{"text":"物理耐性-5% 物理攻撃-5%","color":"dark_red"}]','[{"text":"魔導士が普段身に着けている帽子。","color":"gray"}]'] + data modify storage asset:artifact Lore set value ['[{"text":"魔導士が普段身に着けている帽子。","color":"gray"}]'] # MP以外の消費物 (TextComponentString) (オプション) # data modify storage asset:artifact CostText set value # 使用回数 (int) (オプション) @@ -50,6 +50,10 @@ # data modify storage asset:artifact DisableCooldownMessage set value # MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション) # data modify storage asset:artifact DisableMPMessage set value +# セット装備のID (int) (オプション) + # data modify storage asset:artifact EquipID set value +# 装備時のステータス補正 (Component[]) (オプション) + data modify storage asset:artifact Modifiers set value [{Type:"attackMagic",Slot:"head",Amount:0.05d,Operation:"multiply_base"},{Type:"defenseMagic",Slot:"head",Amount:0.05d,Operation:"multiply_base"},{Type:"mpRegen",Slot:"head",Amount:0.05d,Operation:"multiply_base"},{Type:"attackPhysical",Slot:"head",Amount:-0.05d,Operation:"multiply_base"},{Type:"defensePhysical",Slot:"head",Amount:-0.05d,Operation:"multiply_base"}] # 扱える神 (string[]) Wikiを参照 data modify storage asset:artifact CanUsedGod set value ["Flora", "Nyaptov", "Wi-ki", "Rumor"] # カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) diff --git a/Asset/data/asset/functions/artifact/0707.mage_hat/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0707.mage_hat/trigger/3.main.mcfunction index 85d88b2456..b29315b476 100644 --- a/Asset/data/asset/functions/artifact/0707.mage_hat/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/0707.mage_hat/trigger/3.main.mcfunction @@ -9,37 +9,7 @@ # ここから先は神器側の効果の処理を書く -# 魔法耐性+5% - data modify storage api: Argument.UUID set value [I;1,1,707,6] - data modify storage api: Argument.Amount set value 0.05 - data modify storage api: Argument.Operation set value "multiply_base" - function api:modifier/defense/magic/add - -# 魔法攻撃+5% - data modify storage api: Argument.UUID set value [I;1,1,707,6] - data modify storage api: Argument.Amount set value 0.05 - data modify storage api: Argument.Operation set value "multiply_base" - function api:modifier/attack/magic/add - -# MP回復量+5% - data modify storage api: Argument.UUID set value [I;1,1,707,6] - data modify storage api: Argument.Amount set value 0.05 - data modify storage api: Argument.Operation set value "multiply_base" - function api:modifier/mp_regen/add - -# 物理耐性-5% - data modify storage api: Argument.UUID set value [I;1,1,707,6] - data modify storage api: Argument.Amount set value -0.05 - data modify storage api: Argument.Operation set value "multiply_base" - function api:modifier/defense/physical/add - -# 物理攻撃-5% - data modify storage api: Argument.UUID set value [I;1,1,707,6] - data modify storage api: Argument.Amount set value -0.05 - data modify storage api: Argument.Operation set value "multiply_base" - function api:modifier/attack/physical/add - # 演出 particle witch ~ ~1.7 ~ 0.3 0.1 0.3 1 10 normal @a particle enchant ~ ~1.7 ~ 0.4 0.1 0.4 0 30 normal @a - playsound minecraft:block.enchantment_table.use player @a ~ ~ ~ 0.8 0 0 \ No newline at end of file + playsound minecraft:block.enchantment_table.use player @a ~ ~ ~ 0.8 0 0 diff --git a/Asset/data/asset/functions/artifact/0707.mage_hat/trigger/dis_equip/.mcfunction b/Asset/data/asset/functions/artifact/0707.mage_hat/trigger/dis_equip/.mcfunction deleted file mode 100644 index b48f2ca54b..0000000000 --- a/Asset/data/asset/functions/artifact/0707.mage_hat/trigger/dis_equip/.mcfunction +++ /dev/null @@ -1,7 +0,0 @@ -#> asset:artifact/0707.mage_hat/trigger/dis_equip/ -# -# 装備を外した時に外した部位にのみのidが入った状態でトリガーされる -# -# @within tag/function asset:artifact/dis_equip - -execute if data storage asset:context id{head:707} run function asset:artifact/0707.mage_hat/trigger/dis_equip/main \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0707.mage_hat/trigger/dis_equip/main.mcfunction b/Asset/data/asset/functions/artifact/0707.mage_hat/trigger/dis_equip/main.mcfunction deleted file mode 100644 index 863951022c..0000000000 --- a/Asset/data/asset/functions/artifact/0707.mage_hat/trigger/dis_equip/main.mcfunction +++ /dev/null @@ -1,32 +0,0 @@ -#> asset:artifact/0707.mage_hat/trigger/dis_equip/main -# -# 装備を外した時のメイン処理 -# -# @within function asset:artifact/0707.mage_hat/trigger/dis_equip/ - -# 魔法耐性、魔法攻撃、MP回復量、物理耐性、物理攻撃の削除 - -# UUID - data modify storage api: Argument.UUID set value [I;1,1,707,6] -# 補正の削除 - function api:modifier/defense/magic/remove - -# UUID - data modify storage api: Argument.UUID set value [I;1,1,707,6] -# 補正の削除 - function api:modifier/attack/magic/remove - -# UUID - data modify storage api: Argument.UUID set value [I;1,1,707,6] -# 補正の削除 - function api:modifier/mp_regen/remove - -# UUID - data modify storage api: Argument.UUID set value [I;1,1,707,6] -# 補正の削除 - function api:modifier/defense/physical/remove - -# UUID - data modify storage api: Argument.UUID set value [I;1,1,707,6] -# 補正の削除 - function api:modifier/attack/physical/remove \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0708.mage_robe_upper/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0708.mage_robe_upper/give/2.give.mcfunction index 2e3074edf8..2341a63d0e 100644 --- a/Asset/data/asset/functions/artifact/0708.mage_robe_upper/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0708.mage_robe_upper/give/2.give.mcfunction @@ -15,7 +15,7 @@ # 神器の名前 (TextComponentString) data modify storage asset:artifact Name set value '{"text":"魔導士のローブ(上)","color":"#621B9E"}' # 神器の説明文 (TextComponentString[]) - data modify storage asset:artifact Lore set value ['[{"text":"魔法耐性+5% 魔法攻撃+5%","color":"dark_purple"}]','[{"text":"MP回復量+5%","color":"green"}]','[{"text":"物理耐性-5% 物理攻撃-5%","color":"dark_red"}]','[{"text":"魔導士が普段身に着けているローブ。","color":"gray"}]'] + data modify storage asset:artifact Lore set value ['[{"text":"魔導士が普段身に着けているローブ。","color":"gray"}]'] # MP以外の消費物 (TextComponentString) (オプション) # data modify storage asset:artifact CostText set value # 使用回数 (int) (オプション) @@ -50,6 +50,10 @@ # data modify storage asset:artifact DisableCooldownMessage set value # MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション) # data modify storage asset:artifact DisableMPMessage set value +# セット装備のID (int) (オプション) + # data modify storage asset:artifact EquipID set value +# 装備時のステータス補正 (Component[]) (オプション) + data modify storage asset:artifact Modifiers set value [{Type:"attackMagic",Slot:"chest",Amount:0.05d,Operation:"multiply_base"},{Type:"defenseMagic",Slot:"chest",Amount:0.05d,Operation:"multiply_base"},{Type:"mpRegen",Slot:"chest",Amount:0.05d,Operation:"multiply_base"},{Type:"attackPhysical",Slot:"chest",Amount:-0.05d,Operation:"multiply_base"},{Type:"defensePhysical",Slot:"chest",Amount:-0.05d,Operation:"multiply_base"}] # 扱える神 (string[]) Wikiを参照 data modify storage asset:artifact CanUsedGod set value ["Flora", "Nyaptov", "Wi-ki", "Rumor"] # カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) diff --git a/Asset/data/asset/functions/artifact/0708.mage_robe_upper/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0708.mage_robe_upper/trigger/3.main.mcfunction index d948048e23..2869d4a2e9 100644 --- a/Asset/data/asset/functions/artifact/0708.mage_robe_upper/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/0708.mage_robe_upper/trigger/3.main.mcfunction @@ -9,37 +9,7 @@ # ここから先は神器側の効果の処理を書く -# 魔法耐性+5% - data modify storage api: Argument.UUID set value [I;1,1,708,5] - data modify storage api: Argument.Amount set value 0.05 - data modify storage api: Argument.Operation set value "multiply_base" - function api:modifier/defense/magic/add - -# 魔法攻撃+5% - data modify storage api: Argument.UUID set value [I;1,1,708,5] - data modify storage api: Argument.Amount set value 0.05 - data modify storage api: Argument.Operation set value "multiply_base" - function api:modifier/attack/magic/add - -# MP回復量+5% - data modify storage api: Argument.UUID set value [I;1,1,708,5] - data modify storage api: Argument.Amount set value 0.05 - data modify storage api: Argument.Operation set value "multiply_base" - function api:modifier/mp_regen/add - -# 物理耐性-5% - data modify storage api: Argument.UUID set value [I;1,1,708,5] - data modify storage api: Argument.Amount set value -0.05 - data modify storage api: Argument.Operation set value "multiply_base" - function api:modifier/defense/physical/add - -# 物理攻撃-5% - data modify storage api: Argument.UUID set value [I;1,1,708,5] - data modify storage api: Argument.Amount set value -0.05 - data modify storage api: Argument.Operation set value "multiply_base" - function api:modifier/attack/physical/add - # 演出 particle witch ~ ~1.3 ~ 0.3 0.25 0.3 1 10 normal @a particle enchant ~ ~1.3 ~ 0.4 0.25 0.4 0 30 normal @a - playsound minecraft:block.enchantment_table.use player @a ~ ~ ~ 0.8 0 0 \ No newline at end of file + playsound minecraft:block.enchantment_table.use player @a ~ ~ ~ 0.8 0 0 diff --git a/Asset/data/asset/functions/artifact/0708.mage_robe_upper/trigger/dis_equip/.mcfunction b/Asset/data/asset/functions/artifact/0708.mage_robe_upper/trigger/dis_equip/.mcfunction deleted file mode 100644 index af5b6fde6f..0000000000 --- a/Asset/data/asset/functions/artifact/0708.mage_robe_upper/trigger/dis_equip/.mcfunction +++ /dev/null @@ -1,7 +0,0 @@ -#> asset:artifact/0708.mage_robe_upper/trigger/dis_equip/ -# -# 装備を外した時に外した部位にのみのidが入った状態でトリガーされる -# -# @within tag/function asset:artifact/dis_equip - -execute if data storage asset:context id{chest:708} run function asset:artifact/0708.mage_robe_upper/trigger/dis_equip/main \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0708.mage_robe_upper/trigger/dis_equip/main.mcfunction b/Asset/data/asset/functions/artifact/0708.mage_robe_upper/trigger/dis_equip/main.mcfunction deleted file mode 100644 index efb9beec08..0000000000 --- a/Asset/data/asset/functions/artifact/0708.mage_robe_upper/trigger/dis_equip/main.mcfunction +++ /dev/null @@ -1,32 +0,0 @@ -#> asset:artifact/0708.mage_robe_upper/trigger/dis_equip/main -# -# 装備を外した時のメイン処理 -# -# @within function asset:artifact/0708.mage_robe_upper/trigger/dis_equip/ - -# 魔法耐性、魔法攻撃、MP回復量、物理耐性、物理攻撃の削除 - -# UUID - data modify storage api: Argument.UUID set value [I;1,1,708,5] -# 補正の削除 - function api:modifier/defense/magic/remove - -# UUID - data modify storage api: Argument.UUID set value [I;1,1,708,5] -# 補正の削除 - function api:modifier/attack/magic/remove - -# UUID - data modify storage api: Argument.UUID set value [I;1,1,708,5] -# 補正の削除 - function api:modifier/mp_regen/remove - -# UUID - data modify storage api: Argument.UUID set value [I;1,1,708,5] -# 補正の削除 - function api:modifier/defense/physical/remove - -# UUID - data modify storage api: Argument.UUID set value [I;1,1,708,5] -# 補正の削除 - function api:modifier/attack/physical/remove \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0709.mage_robe_lower/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0709.mage_robe_lower/give/2.give.mcfunction index 71a5d6fdef..68e5f51576 100644 --- a/Asset/data/asset/functions/artifact/0709.mage_robe_lower/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0709.mage_robe_lower/give/2.give.mcfunction @@ -15,7 +15,7 @@ # 神器の名前 (TextComponentString) data modify storage asset:artifact Name set value '{"text":"魔導士のローブ(下)","color":"#621B9E"}' # 神器の説明文 (TextComponentString[]) - data modify storage asset:artifact Lore set value ['[{"text":"魔法耐性+5% 魔法攻撃+5%","color":"dark_purple"}]','[{"text":"MP回復量+5%","color":"green"}]','[{"text":"物理耐性-5% 物理攻撃-5%","color":"dark_red"}]','[{"text":"魔導士が普段身に着けているローブ。","color":"gray"}]'] + data modify storage asset:artifact Lore set value ['[{"text":"魔導士が普段身に着けているローブ。","color":"gray"}]'] # MP以外の消費物 (TextComponentString) (オプション) # data modify storage asset:artifact CostText set value # 使用回数 (int) (オプション) @@ -50,6 +50,10 @@ # data modify storage asset:artifact DisableCooldownMessage set value # MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション) # data modify storage asset:artifact DisableMPMessage set value +# セット装備のID (int) (オプション) + # data modify storage asset:artifact EquipID set value +# 装備時のステータス補正 (Component[]) (オプション) + data modify storage asset:artifact Modifiers set value [{Type:"attackMagic",Slot:"legs",Amount:0.05d,Operation:"multiply_base"},{Type:"defenseMagic",Slot:"legs",Amount:0.05d,Operation:"multiply_base"},{Type:"mpRegen",Slot:"legs",Amount:0.05d,Operation:"multiply_base"},{Type:"attackPhysical",Slot:"legs",Amount:-0.05d,Operation:"multiply_base"},{Type:"defensePhysical",Slot:"legs",Amount:-0.05d,Operation:"multiply_base"}] # 扱える神 (string[]) Wikiを参照 data modify storage asset:artifact CanUsedGod set value ["Flora", "Nyaptov", "Wi-ki", "Rumor"] # カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) diff --git a/Asset/data/asset/functions/artifact/0709.mage_robe_lower/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0709.mage_robe_lower/trigger/3.main.mcfunction index 8c682e43b4..68d917fc67 100644 --- a/Asset/data/asset/functions/artifact/0709.mage_robe_lower/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/0709.mage_robe_lower/trigger/3.main.mcfunction @@ -9,37 +9,7 @@ # ここから先は神器側の効果の処理を書く -# 魔法耐性+5% - data modify storage api: Argument.UUID set value [I;1,1,709,4] - data modify storage api: Argument.Amount set value 0.05 - data modify storage api: Argument.Operation set value "multiply_base" - function api:modifier/defense/magic/add - -# 魔法攻撃+5% - data modify storage api: Argument.UUID set value [I;1,1,709,4] - data modify storage api: Argument.Amount set value 0.05 - data modify storage api: Argument.Operation set value "multiply_base" - function api:modifier/attack/magic/add - -# MP回復量+5% - data modify storage api: Argument.UUID set value [I;1,1,709,4] - data modify storage api: Argument.Amount set value 0.05 - data modify storage api: Argument.Operation set value "multiply_base" - function api:modifier/mp_regen/add - -# 物理耐性-5% - data modify storage api: Argument.UUID set value [I;1,1,709,4] - data modify storage api: Argument.Amount set value -0.05 - data modify storage api: Argument.Operation set value "multiply_base" - function api:modifier/defense/physical/add - -# 物理攻撃-5% - data modify storage api: Argument.UUID set value [I;1,1,709,4] - data modify storage api: Argument.Amount set value -0.05 - data modify storage api: Argument.Operation set value "multiply_base" - function api:modifier/attack/physical/add - # 演出 particle witch ~ ~0.4 ~ 0.3 0.15 0.3 1 10 normal @a particle enchant ~ ~0.4 ~ 0.4 0.15 0.4 0 30 normal @a - playsound minecraft:block.enchantment_table.use player @a ~ ~ ~ 0.8 0 0 \ No newline at end of file + playsound minecraft:block.enchantment_table.use player @a ~ ~ ~ 0.8 0 0 diff --git a/Asset/data/asset/functions/artifact/0709.mage_robe_lower/trigger/dis_equip/.mcfunction b/Asset/data/asset/functions/artifact/0709.mage_robe_lower/trigger/dis_equip/.mcfunction deleted file mode 100644 index 3ca1b7cbab..0000000000 --- a/Asset/data/asset/functions/artifact/0709.mage_robe_lower/trigger/dis_equip/.mcfunction +++ /dev/null @@ -1,7 +0,0 @@ -#> asset:artifact/0709.mage_robe_lower/trigger/dis_equip/ -# -# 装備を外した時に外した部位にのみのidが入った状態でトリガーされる -# -# @within tag/function asset:artifact/dis_equip - -execute if data storage asset:context id{legs:709} run function asset:artifact/0709.mage_robe_lower/trigger/dis_equip/main \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0709.mage_robe_lower/trigger/dis_equip/main.mcfunction b/Asset/data/asset/functions/artifact/0709.mage_robe_lower/trigger/dis_equip/main.mcfunction deleted file mode 100644 index 11e0dea6ef..0000000000 --- a/Asset/data/asset/functions/artifact/0709.mage_robe_lower/trigger/dis_equip/main.mcfunction +++ /dev/null @@ -1,32 +0,0 @@ -#> asset:artifact/0709.mage_robe_lower/trigger/dis_equip/main -# -# 装備を外した時のメイン処理 -# -# @within function asset:artifact/0709.mage_robe_lower/trigger/dis_equip/ - -# 魔法耐性、魔法攻撃、MP回復量、物理耐性、物理攻撃の削除 - -# UUID - data modify storage api: Argument.UUID set value [I;1,1,709,4] -# 補正の削除 - function api:modifier/defense/magic/remove - -# UUID - data modify storage api: Argument.UUID set value [I;1,1,709,4] -# 補正の削除 - function api:modifier/attack/magic/remove - -# UUID - data modify storage api: Argument.UUID set value [I;1,1,709,4] -# 補正の削除 - function api:modifier/mp_regen/remove - -# UUID - data modify storage api: Argument.UUID set value [I;1,1,709,4] -# 補正の削除 - function api:modifier/defense/physical/remove - -# UUID - data modify storage api: Argument.UUID set value [I;1,1,709,4] -# 補正の削除 - function api:modifier/attack/physical/remove \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0710.mage_boots/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0710.mage_boots/give/2.give.mcfunction index 94dfd6b82e..ce076f07fd 100644 --- a/Asset/data/asset/functions/artifact/0710.mage_boots/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/0710.mage_boots/give/2.give.mcfunction @@ -15,7 +15,7 @@ # 神器の名前 (TextComponentString) data modify storage asset:artifact Name set value '{"text":"魔導士の靴","color":"#621B9E"}' # 神器の説明文 (TextComponentString[]) - data modify storage asset:artifact Lore set value ['[{"text":"魔法耐性+5% 魔法攻撃+5%","color":"dark_purple"}]','[{"text":"MP回復量+5%","color":"green"}]','[{"text":"物理耐性-5% 物理攻撃-5%","color":"dark_red"}]','[{"text":"魔導士が普段身に着けている靴。","color":"gray"}]'] + data modify storage asset:artifact Lore set value ['[{"text":"魔導士が普段身に着けている靴。","color":"gray"}]'] # MP以外の消費物 (TextComponentString) (オプション) # data modify storage asset:artifact CostText set value # 使用回数 (int) (オプション) @@ -50,6 +50,10 @@ # data modify storage asset:artifact DisableCooldownMessage set value # MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション) # data modify storage asset:artifact DisableMPMessage set value +# セット装備のID (int) (オプション) + # data modify storage asset:artifact EquipID set value +# 装備時のステータス補正 (Component[]) (オプション) + data modify storage asset:artifact Modifiers set value [{Type:"attackMagic",Slot:"feet",Amount:0.05d,Operation:"multiply_base"},{Type:"defenseMagic",Slot:"feet",Amount:0.05d,Operation:"multiply_base"},{Type:"mpRegen",Slot:"feet",Amount:0.05d,Operation:"multiply_base"},{Type:"attackPhysical",Slot:"feet",Amount:-0.05d,Operation:"multiply_base"},{Type:"defensePhysical",Slot:"feet",Amount:-0.05d,Operation:"multiply_base"}] # 扱える神 (string[]) Wikiを参照 data modify storage asset:artifact CanUsedGod set value ["Flora", "Nyaptov", "Wi-ki", "Rumor"] # カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) diff --git a/Asset/data/asset/functions/artifact/0710.mage_boots/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0710.mage_boots/trigger/3.main.mcfunction index 76fd64af02..0345b9e478 100644 --- a/Asset/data/asset/functions/artifact/0710.mage_boots/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/0710.mage_boots/trigger/3.main.mcfunction @@ -9,37 +9,7 @@ # ここから先は神器側の効果の処理を書く -# 魔法耐性+5% - data modify storage api: Argument.UUID set value [I;1,1,710,3] - data modify storage api: Argument.Amount set value 0.05 - data modify storage api: Argument.Operation set value "multiply_base" - function api:modifier/defense/magic/add - -# 魔法攻撃+7.5% - data modify storage api: Argument.UUID set value [I;1,1,710,3] - data modify storage api: Argument.Amount set value 0.05 - data modify storage api: Argument.Operation set value "multiply_base" - function api:modifier/attack/magic/add - -# MP回復量+5% - data modify storage api: Argument.UUID set value [I;1,1,710,3] - data modify storage api: Argument.Amount set value 0.05 - data modify storage api: Argument.Operation set value "multiply_base" - function api:modifier/mp_regen/add - -# 物理耐性-5% - data modify storage api: Argument.UUID set value [I;1,1,710,3] - data modify storage api: Argument.Amount set value -0.05 - data modify storage api: Argument.Operation set value "multiply_base" - function api:modifier/defense/physical/add - -# 物理攻撃-7.5% - data modify storage api: Argument.UUID set value [I;1,1,710,3] - data modify storage api: Argument.Amount set value -0.05 - data modify storage api: Argument.Operation set value "multiply_base" - function api:modifier/attack/physical/add - # 演出 particle witch ~ ~0.3 ~ 0.3 0.1 0.3 1 10 normal @a particle enchant ~ ~0.3 ~ 0.4 0.1 0.4 0 30 normal @a - playsound minecraft:block.enchantment_table.use player @a ~ ~ ~ 0.8 0 0 \ No newline at end of file + playsound minecraft:block.enchantment_table.use player @a ~ ~ ~ 0.8 0 0 diff --git a/Asset/data/asset/functions/artifact/0710.mage_boots/trigger/dis_equip/.mcfunction b/Asset/data/asset/functions/artifact/0710.mage_boots/trigger/dis_equip/.mcfunction deleted file mode 100644 index e0539220c4..0000000000 --- a/Asset/data/asset/functions/artifact/0710.mage_boots/trigger/dis_equip/.mcfunction +++ /dev/null @@ -1,7 +0,0 @@ -#> asset:artifact/0710.mage_boots/trigger/dis_equip/ -# -# 装備を外した時に外した部位にのみのidが入った状態でトリガーされる -# -# @within tag/function asset:artifact/dis_equip - -execute if data storage asset:context id{feet:710} run function asset:artifact/0710.mage_boots/trigger/dis_equip/main \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0710.mage_boots/trigger/dis_equip/main.mcfunction b/Asset/data/asset/functions/artifact/0710.mage_boots/trigger/dis_equip/main.mcfunction deleted file mode 100644 index 9f2030a5ed..0000000000 --- a/Asset/data/asset/functions/artifact/0710.mage_boots/trigger/dis_equip/main.mcfunction +++ /dev/null @@ -1,32 +0,0 @@ -#> asset:artifact/0710.mage_boots/trigger/dis_equip/main -# -# 装備を外した時のメイン処理 -# -# @within function asset:artifact/0710.mage_boots/trigger/dis_equip/ - -# 魔法耐性、魔法攻撃、MP回復量、物理耐性、物理攻撃の削除 - -# UUID - data modify storage api: Argument.UUID set value [I;1,1,710,3] -# 補正の削除 - function api:modifier/defense/magic/remove - -# UUID - data modify storage api: Argument.UUID set value [I;1,1,710,3] -# 補正の削除 - function api:modifier/attack/magic/remove - -# UUID - data modify storage api: Argument.UUID set value [I;1,1,710,3] -# 補正の削除 - function api:modifier/mp_regen/remove - -# UUID - data modify storage api: Argument.UUID set value [I;1,1,710,3] -# 補正の削除 - function api:modifier/defense/physical/remove - -# UUID - data modify storage api: Argument.UUID set value [I;1,1,710,3] -# 補正の削除 - function api:modifier/attack/physical/remove \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0232.soul_fire/_/given.mcfunction b/Asset/data/asset/functions/effect/0232.soul_fire/_/given.mcfunction new file mode 100644 index 0000000000..6553ba5a11 --- /dev/null +++ b/Asset/data/asset/functions/effect/0232.soul_fire/_/given.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0232.soul_fire/_/given +# +# Effectが付与された時に実行されるfunction +# +# @within tag/function asset:effect/given + +execute if data storage asset:context {id:232} run function asset:effect/0232.soul_fire/given/ \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0232.soul_fire/_/re-given.mcfunction b/Asset/data/asset/functions/effect/0232.soul_fire/_/re-given.mcfunction new file mode 100644 index 0000000000..44d94ba965 --- /dev/null +++ b/Asset/data/asset/functions/effect/0232.soul_fire/_/re-given.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0232.soul_fire/_/re-given +# +# Effectが上書きされた時に実行されるfunction +# +# @within tag/function asset:effect/re-given + +execute if data storage asset:context {id:232} run function asset:effect/0232.soul_fire/re-given/ \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0232.soul_fire/_/register.mcfunction b/Asset/data/asset/functions/effect/0232.soul_fire/_/register.mcfunction new file mode 100644 index 0000000000..0cdd30bf90 --- /dev/null +++ b/Asset/data/asset/functions/effect/0232.soul_fire/_/register.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0232.soul_fire/_/register +# +# Effectが上書きされた時に実行されるfunction +# +# @within tag/function asset:effect/register + +execute if data storage asset:context {id:232} run function asset:effect/0232.soul_fire/register diff --git a/Asset/data/asset/functions/effect/0232.soul_fire/_/remove.mcfunction b/Asset/data/asset/functions/effect/0232.soul_fire/_/remove.mcfunction new file mode 100644 index 0000000000..704e43e615 --- /dev/null +++ b/Asset/data/asset/functions/effect/0232.soul_fire/_/remove.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0232.soul_fire/_/remove +# +# Effectが神器や牛乳によって削除された時に実行されるfunction +# +# @within tag/function asset:effect/remove + +execute if data storage asset:context {id:232} run function asset:effect/0232.soul_fire/remove/ \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0232.soul_fire/_/tick.mcfunction b/Asset/data/asset/functions/effect/0232.soul_fire/_/tick.mcfunction new file mode 100644 index 0000000000..213878d74c --- /dev/null +++ b/Asset/data/asset/functions/effect/0232.soul_fire/_/tick.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0232.soul_fire/_/tick +# +# Effectが神器や牛乳によって削除された時に実行されるfunction +# +# @within tag/function asset:effect/tick + +execute if data storage asset:context {id:232} run function asset:effect/0232.soul_fire/tick/ diff --git a/Asset/data/asset/functions/effect/0232.soul_fire/fullset/dis_equip.mcfunction b/Asset/data/asset/functions/effect/0232.soul_fire/fullset/dis_equip.mcfunction new file mode 100644 index 0000000000..4cba1b8bf8 --- /dev/null +++ b/Asset/data/asset/functions/effect/0232.soul_fire/fullset/dis_equip.mcfunction @@ -0,0 +1,312 @@ +#> asset:effect/0232.soul_fire/fullset/dis_equip +# @within function +# asset:effect/0232.soul_fire/re-given/ +# asset:effect/0232.soul_fire/remove/ + +# 補正 + # 火攻撃+10% + data modify storage api: Argument.UUID set value [I;1,3,232,0] + function api:modifier/attack/fire/remove + + # MP回復量+8% + data modify storage api: Argument.UUID set value [I;1,3,232,0] + function api:modifier/mp_regen/remove + + # 最大体力-10% + data modify storage api: Argument.UUID set value [I;1,3,232,0] + function api:modifier/max_health/remove + +# 演出 + # 1つ目の円 + execute rotated ~0 0 positioned ^ ^0.3 ^ rotated ~ ~5 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000001 0 normal @a + execute rotated ~30 0 positioned ^ ^0.3 ^ rotated ~ ~5 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000001 0 normal @a + execute rotated ~60 0 positioned ^ ^0.3 ^ rotated ~ ~5 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000001 0 normal @a + execute rotated ~90 0 positioned ^ ^0.3 ^ rotated ~ ~5 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000001 0 normal @a + execute rotated ~120 0 positioned ^ ^0.3 ^ rotated ~ ~5 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000001 0 normal @a + execute rotated ~150 0 positioned ^ ^0.3 ^ rotated ~ ~5 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000001 0 normal @a + execute rotated ~180 0 positioned ^ ^0.3 ^ rotated ~ ~5 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000001 0 normal @a + execute rotated ~210 0 positioned ^ ^0.3 ^ rotated ~ ~5 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000001 0 normal @a + execute rotated ~240 0 positioned ^ ^0.3 ^ rotated ~ ~5 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000001 0 normal @a + execute rotated ~270 0 positioned ^ ^0.3 ^ rotated ~ ~5 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000001 0 normal @a + execute rotated ~300 0 positioned ^ ^0.3 ^ rotated ~ ~5 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000001 0 normal @a + execute rotated ~330 0 positioned ^ ^0.3 ^ rotated ~ ~5 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000001 0 normal @a + + # 2つ目の円 + execute rotated ~0 0 positioned ^ ^0.2 ^ rotated ~ ~-20 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a + execute rotated ~20 0 positioned ^ ^0.2 ^ rotated ~ ~-20 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a + execute rotated ~40 0 positioned ^ ^0.2 ^ rotated ~ ~-20 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a + execute rotated ~60 0 positioned ^ ^0.2 ^ rotated ~ ~-20 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a + execute rotated ~80 0 positioned ^ ^0.2 ^ rotated ~ ~-20 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a + execute rotated ~100 0 positioned ^ ^0.2 ^ rotated ~ ~-20 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a + execute rotated ~120 0 positioned ^ ^0.2 ^ rotated ~ ~-20 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a + execute rotated ~140 0 positioned ^ ^0.2 ^ rotated ~ ~-20 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a + execute rotated ~160 0 positioned ^ ^0.2 ^ rotated ~ ~-20 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a + execute rotated ~180 0 positioned ^ ^0.2 ^ rotated ~ ~-20 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a + execute rotated ~200 0 positioned ^ ^0.2 ^ rotated ~ ~-20 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a + execute rotated ~220 0 positioned ^ ^0.2 ^ rotated ~ ~-20 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a + execute rotated ~240 0 positioned ^ ^0.2 ^ rotated ~ ~-20 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a + execute rotated ~260 0 positioned ^ ^0.2 ^ rotated ~ ~-20 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a + execute rotated ~280 0 positioned ^ ^0.2 ^ rotated ~ ~-20 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a + execute rotated ~300 0 positioned ^ ^0.2 ^ rotated ~ ~-20 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a + execute rotated ~320 0 positioned ^ ^0.2 ^ rotated ~ ~-20 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a + execute rotated ~340 0 positioned ^ ^0.2 ^ rotated ~ ~-20 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a + + # 2つ目の円 + execute rotated ~0 0 positioned ^ ^0.2 ^ rotated ~ ~-40 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a + execute rotated ~10 0 positioned ^ ^0.2 ^ rotated ~ ~-40 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a + execute rotated ~20 0 positioned ^ ^0.2 ^ rotated ~ ~-40 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a + execute rotated ~30 0 positioned ^ ^0.2 ^ rotated ~ ~-40 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a + execute rotated ~40 0 positioned ^ ^0.2 ^ rotated ~ ~-40 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a + execute rotated ~50 0 positioned ^ ^0.2 ^ rotated ~ ~-40 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a + execute rotated ~60 0 positioned ^ ^0.2 ^ rotated ~ ~-40 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a + execute rotated ~70 0 positioned ^ ^0.2 ^ rotated ~ ~-40 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a + execute rotated ~80 0 positioned ^ ^0.2 ^ rotated ~ ~-40 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a + execute rotated ~90 0 positioned ^ ^0.2 ^ rotated ~ ~-40 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a + execute rotated ~100 0 positioned ^ ^0.2 ^ rotated ~ ~-40 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a + execute rotated ~110 0 positioned ^ ^0.2 ^ rotated ~ ~-40 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a + execute rotated ~120 0 positioned ^ ^0.2 ^ rotated ~ ~-40 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a + execute rotated ~130 0 positioned ^ ^0.2 ^ rotated ~ ~-40 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a + execute rotated ~140 0 positioned ^ ^0.2 ^ rotated ~ ~-40 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a + execute rotated ~150 0 positioned ^ ^0.2 ^ rotated ~ ~-40 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a + execute rotated ~160 0 positioned ^ ^0.2 ^ rotated ~ ~-40 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a + execute rotated ~170 0 positioned ^ ^0.2 ^ rotated ~ ~-40 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a + execute rotated ~180 0 positioned ^ ^0.2 ^ rotated ~ ~-40 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a + execute rotated ~190 0 positioned ^ ^0.2 ^ rotated ~ ~-40 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a + execute rotated ~200 0 positioned ^ ^0.2 ^ rotated ~ ~-40 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a + execute rotated ~210 0 positioned ^ ^0.2 ^ rotated ~ ~-40 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a + execute rotated ~220 0 positioned ^ ^0.2 ^ rotated ~ ~-40 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a + execute rotated ~230 0 positioned ^ ^0.2 ^ rotated ~ ~-40 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a + execute rotated ~240 0 positioned ^ ^0.2 ^ rotated ~ ~-40 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a + execute rotated ~250 0 positioned ^ ^0.2 ^ rotated ~ ~-40 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a + execute rotated ~260 0 positioned ^ ^0.2 ^ rotated ~ ~-40 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a + execute rotated ~270 0 positioned ^ ^0.2 ^ rotated ~ ~-40 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a + execute rotated ~280 0 positioned ^ ^0.2 ^ rotated ~ ~-40 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a + execute rotated ~290 0 positioned ^ ^0.2 ^ rotated ~ ~-40 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a + execute rotated ~300 0 positioned ^ ^0.2 ^ rotated ~ ~-40 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a + execute rotated ~310 0 positioned ^ ^0.2 ^ rotated ~ ~-40 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a + execute rotated ~320 0 positioned ^ ^0.2 ^ rotated ~ ~-40 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a + execute rotated ~330 0 positioned ^ ^0.2 ^ rotated ~ ~-40 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a + execute rotated ~340 0 positioned ^ ^0.2 ^ rotated ~ ~-40 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a + execute rotated ~350 0 positioned ^ ^0.2 ^ rotated ~ ~-40 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a + + # 4つ目の円 + execute rotated ~0 0 positioned ^ ^0.2 ^ rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~5 0 positioned ^ ^0.2 ^ rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~10 0 positioned ^ ^0.2 ^ rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~15 0 positioned ^ ^0.2 ^ rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~20 0 positioned ^ ^0.2 ^ rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~25 0 positioned ^ ^0.2 ^ rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~30 0 positioned ^ ^0.2 ^ rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~35 0 positioned ^ ^0.2 ^ rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~40 0 positioned ^ ^0.2 ^ rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~45 0 positioned ^ ^0.2 ^ rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~50 0 positioned ^ ^0.2 ^ rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~55 0 positioned ^ ^0.2 ^ rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~60 0 positioned ^ ^0.2 ^ rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~65 0 positioned ^ ^0.2 ^ rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~70 0 positioned ^ ^0.2 ^ rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~75 0 positioned ^ ^0.2 ^ rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~80 0 positioned ^ ^0.2 ^ rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~85 0 positioned ^ ^0.2 ^ rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~90 0 positioned ^ ^0.2 ^ rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~95 0 positioned ^ ^0.2 ^ rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~100 0 positioned ^ ^0.2 ^ rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~105 0 positioned ^ ^0.2 ^ rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~110 0 positioned ^ ^0.2 ^ rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~115 0 positioned ^ ^0.2 ^ rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~120 0 positioned ^ ^0.2 ^ rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~125 0 positioned ^ ^0.2 ^ rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~130 0 positioned ^ ^0.2 ^ rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~135 0 positioned ^ ^0.2 ^ rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~140 0 positioned ^ ^0.2 ^ rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~145 0 positioned ^ ^0.2 ^ rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~150 0 positioned ^ ^0.2 ^ rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~155 0 positioned ^ ^0.2 ^ rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~160 0 positioned ^ ^0.2 ^ rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~165 0 positioned ^ ^0.2 ^ rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~170 0 positioned ^ ^0.2 ^ rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~175 0 positioned ^ ^0.2 ^ rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~180 0 positioned ^ ^0.2 ^ rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~185 0 positioned ^ ^0.2 ^ rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~190 0 positioned ^ ^0.2 ^ rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~195 0 positioned ^ ^0.2 ^ rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~200 0 positioned ^ ^0.2 ^ rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~205 0 positioned ^ ^0.2 ^ rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~210 0 positioned ^ ^0.2 ^ rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~215 0 positioned ^ ^0.2 ^ rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~220 0 positioned ^ ^0.2 ^ rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~225 0 positioned ^ ^0.2 ^ rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~230 0 positioned ^ ^0.2 ^ rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~235 0 positioned ^ ^0.2 ^ rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~240 0 positioned ^ ^0.2 ^ rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~245 0 positioned ^ ^0.2 ^ rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~250 0 positioned ^ ^0.2 ^ rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~255 0 positioned ^ ^0.2 ^ rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~260 0 positioned ^ ^0.2 ^ rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~265 0 positioned ^ ^0.2 ^ rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~270 0 positioned ^ ^0.2 ^ rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~275 0 positioned ^ ^0.2 ^ rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~280 0 positioned ^ ^0.2 ^ rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~285 0 positioned ^ ^0.2 ^ rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~290 0 positioned ^ ^0.2 ^ rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~295 0 positioned ^ ^0.2 ^ rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~300 0 positioned ^ ^0.2 ^ rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~305 0 positioned ^ ^0.2 ^ rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~310 0 positioned ^ ^0.2 ^ rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~315 0 positioned ^ ^0.2 ^ rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~320 0 positioned ^ ^0.2 ^ rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~325 0 positioned ^ ^0.2 ^ rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~330 0 positioned ^ ^0.2 ^ rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~335 0 positioned ^ ^0.2 ^ rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~340 0 positioned ^ ^0.2 ^ rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~345 0 positioned ^ ^0.2 ^ rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~350 0 positioned ^ ^0.2 ^ rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~355 0 positioned ^ ^0.2 ^ rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + + # ここより下はsoul_fire ver + + # 1つ目の円 + execute rotated ~0 0 positioned ^ ^0 ^ rotated ~ ~-5 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000001 0 normal @a + execute rotated ~30 0 positioned ^ ^0 ^ rotated ~ ~-5 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000001 0 normal @a + execute rotated ~60 0 positioned ^ ^0 ^ rotated ~ ~-5 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000001 0 normal @a + execute rotated ~90 0 positioned ^ ^0 ^ rotated ~ ~-5 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000001 0 normal @a + execute rotated ~120 0 positioned ^ ^0 ^ rotated ~ ~-5 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000001 0 normal @a + execute rotated ~150 0 positioned ^ ^0 ^ rotated ~ ~-5 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000001 0 normal @a + execute rotated ~180 0 positioned ^ ^0 ^ rotated ~ ~-5 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000001 0 normal @a + execute rotated ~210 0 positioned ^ ^0 ^ rotated ~ ~-5 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000001 0 normal @a + execute rotated ~240 0 positioned ^ ^0 ^ rotated ~ ~-5 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000001 0 normal @a + execute rotated ~270 0 positioned ^ ^0 ^ rotated ~ ~-5 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000001 0 normal @a + execute rotated ~300 0 positioned ^ ^0 ^ rotated ~ ~-5 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000001 0 normal @a + execute rotated ~330 0 positioned ^ ^0 ^ rotated ~ ~-5 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000001 0 normal @a + + # 2つ目の円 + execute rotated ~0 0 positioned ^ ^0 ^ rotated ~ ~-20 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a + execute rotated ~20 0 positioned ^ ^0 ^ rotated ~ ~-20 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a + execute rotated ~40 0 positioned ^ ^0 ^ rotated ~ ~-20 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a + execute rotated ~60 0 positioned ^ ^0 ^ rotated ~ ~-20 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a + execute rotated ~80 0 positioned ^ ^0 ^ rotated ~ ~-20 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a + execute rotated ~100 0 positioned ^ ^0 ^ rotated ~ ~-20 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a + execute rotated ~120 0 positioned ^ ^0 ^ rotated ~ ~-20 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a + execute rotated ~140 0 positioned ^ ^0 ^ rotated ~ ~-20 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a + execute rotated ~160 0 positioned ^ ^0 ^ rotated ~ ~-20 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a + execute rotated ~180 0 positioned ^ ^0 ^ rotated ~ ~-20 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a + execute rotated ~200 0 positioned ^ ^0 ^ rotated ~ ~-20 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a + execute rotated ~220 0 positioned ^ ^0 ^ rotated ~ ~-20 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a + execute rotated ~240 0 positioned ^ ^0 ^ rotated ~ ~-20 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a + execute rotated ~260 0 positioned ^ ^0 ^ rotated ~ ~-20 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a + execute rotated ~280 0 positioned ^ ^0 ^ rotated ~ ~-20 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a + execute rotated ~300 0 positioned ^ ^0 ^ rotated ~ ~-20 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a + execute rotated ~320 0 positioned ^ ^0 ^ rotated ~ ~-20 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a + execute rotated ~340 0 positioned ^ ^0 ^ rotated ~ ~-20 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a + + # 2つ目の円 + execute rotated ~0 0 positioned ^ ^0 ^ rotated ~ ~-40 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a + execute rotated ~10 0 positioned ^ ^0 ^ rotated ~ ~-40 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a + execute rotated ~20 0 positioned ^ ^0 ^ rotated ~ ~-40 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a + execute rotated ~30 0 positioned ^ ^0 ^ rotated ~ ~-40 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a + execute rotated ~40 0 positioned ^ ^0 ^ rotated ~ ~-40 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a + execute rotated ~50 0 positioned ^ ^0 ^ rotated ~ ~-40 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a + execute rotated ~60 0 positioned ^ ^0 ^ rotated ~ ~-40 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a + execute rotated ~70 0 positioned ^ ^0 ^ rotated ~ ~-40 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a + execute rotated ~80 0 positioned ^ ^0 ^ rotated ~ ~-40 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a + execute rotated ~90 0 positioned ^ ^0 ^ rotated ~ ~-40 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a + execute rotated ~100 0 positioned ^ ^0 ^ rotated ~ ~-40 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a + execute rotated ~110 0 positioned ^ ^0 ^ rotated ~ ~-40 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a + execute rotated ~120 0 positioned ^ ^0 ^ rotated ~ ~-40 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a + execute rotated ~130 0 positioned ^ ^0 ^ rotated ~ ~-40 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a + execute rotated ~140 0 positioned ^ ^0 ^ rotated ~ ~-40 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a + execute rotated ~150 0 positioned ^ ^0 ^ rotated ~ ~-40 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a + execute rotated ~160 0 positioned ^ ^0 ^ rotated ~ ~-40 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a + execute rotated ~170 0 positioned ^ ^0 ^ rotated ~ ~-40 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a + execute rotated ~180 0 positioned ^ ^0 ^ rotated ~ ~-40 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a + execute rotated ~190 0 positioned ^ ^0 ^ rotated ~ ~-40 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a + execute rotated ~200 0 positioned ^ ^0 ^ rotated ~ ~-40 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a + execute rotated ~210 0 positioned ^ ^0 ^ rotated ~ ~-40 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a + execute rotated ~220 0 positioned ^ ^0 ^ rotated ~ ~-40 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a + execute rotated ~230 0 positioned ^ ^0 ^ rotated ~ ~-40 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a + execute rotated ~240 0 positioned ^ ^0 ^ rotated ~ ~-40 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a + execute rotated ~250 0 positioned ^ ^0 ^ rotated ~ ~-40 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a + execute rotated ~260 0 positioned ^ ^0 ^ rotated ~ ~-40 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a + execute rotated ~270 0 positioned ^ ^0 ^ rotated ~ ~-40 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a + execute rotated ~280 0 positioned ^ ^0 ^ rotated ~ ~-40 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a + execute rotated ~290 0 positioned ^ ^0 ^ rotated ~ ~-40 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a + execute rotated ~300 0 positioned ^ ^0 ^ rotated ~ ~-40 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a + execute rotated ~310 0 positioned ^ ^0 ^ rotated ~ ~-40 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a + execute rotated ~320 0 positioned ^ ^0 ^ rotated ~ ~-40 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a + execute rotated ~330 0 positioned ^ ^0 ^ rotated ~ ~-40 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a + execute rotated ~340 0 positioned ^ ^0 ^ rotated ~ ~-40 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a + execute rotated ~350 0 positioned ^ ^0 ^ rotated ~ ~-40 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a + + # 4つ目の円 + execute rotated ~0 0 positioned ^ ^0 ^ rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~5 0 positioned ^ ^0 ^ rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~10 0 positioned ^ ^0 ^ rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~15 0 positioned ^ ^0 ^ rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~20 0 positioned ^ ^0 ^ rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~25 0 positioned ^ ^0 ^ rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~30 0 positioned ^ ^0 ^ rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~35 0 positioned ^ ^0 ^ rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~40 0 positioned ^ ^0 ^ rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~45 0 positioned ^ ^0 ^ rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~50 0 positioned ^ ^0 ^ rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~55 0 positioned ^ ^0 ^ rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~60 0 positioned ^ ^0 ^ rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~65 0 positioned ^ ^0 ^ rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~70 0 positioned ^ ^0 ^ rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~75 0 positioned ^ ^0 ^ rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~80 0 positioned ^ ^0 ^ rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~85 0 positioned ^ ^0 ^ rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~90 0 positioned ^ ^0 ^ rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~95 0 positioned ^ ^0 ^ rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~100 0 positioned ^ ^0 ^ rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~105 0 positioned ^ ^0 ^ rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~110 0 positioned ^ ^0 ^ rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~115 0 positioned ^ ^0 ^ rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~120 0 positioned ^ ^0 ^ rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~125 0 positioned ^ ^0 ^ rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~130 0 positioned ^ ^0 ^ rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~135 0 positioned ^ ^0 ^ rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~140 0 positioned ^ ^0 ^ rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~145 0 positioned ^ ^0 ^ rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~150 0 positioned ^ ^0 ^ rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~155 0 positioned ^ ^0 ^ rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~160 0 positioned ^ ^0 ^ rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~165 0 positioned ^ ^0 ^ rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~170 0 positioned ^ ^0 ^ rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~175 0 positioned ^ ^0 ^ rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~180 0 positioned ^ ^0 ^ rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~185 0 positioned ^ ^0 ^ rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~190 0 positioned ^ ^0 ^ rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~195 0 positioned ^ ^0 ^ rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~200 0 positioned ^ ^0 ^ rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~205 0 positioned ^ ^0 ^ rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~210 0 positioned ^ ^0 ^ rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~215 0 positioned ^ ^0 ^ rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~220 0 positioned ^ ^0 ^ rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~225 0 positioned ^ ^0 ^ rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~230 0 positioned ^ ^0 ^ rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~235 0 positioned ^ ^0 ^ rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~240 0 positioned ^ ^0 ^ rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~245 0 positioned ^ ^0 ^ rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~250 0 positioned ^ ^0 ^ rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~255 0 positioned ^ ^0 ^ rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~260 0 positioned ^ ^0 ^ rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~265 0 positioned ^ ^0 ^ rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~270 0 positioned ^ ^0 ^ rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~275 0 positioned ^ ^0 ^ rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~280 0 positioned ^ ^0 ^ rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~285 0 positioned ^ ^0 ^ rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~290 0 positioned ^ ^0 ^ rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~295 0 positioned ^ ^0 ^ rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~300 0 positioned ^ ^0 ^ rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~305 0 positioned ^ ^0 ^ rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~310 0 positioned ^ ^0 ^ rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~315 0 positioned ^ ^0 ^ rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~320 0 positioned ^ ^0 ^ rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~325 0 positioned ^ ^0 ^ rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~330 0 positioned ^ ^0 ^ rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~335 0 positioned ^ ^0 ^ rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~340 0 positioned ^ ^0 ^ rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~345 0 positioned ^ ^0 ^ rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~350 0 positioned ^ ^0 ^ rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~355 0 positioned ^ ^0 ^ rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a diff --git a/Asset/data/asset/functions/effect/0232.soul_fire/fullset/equip.mcfunction b/Asset/data/asset/functions/effect/0232.soul_fire/fullset/equip.mcfunction new file mode 100644 index 0000000000..764b8c1899 --- /dev/null +++ b/Asset/data/asset/functions/effect/0232.soul_fire/fullset/equip.mcfunction @@ -0,0 +1,316 @@ +#> asset:effect/0232.soul_fire/fullset/equip +# @within function asset:effect/0232.soul_fire/*given/ + +# 補正 + # 火攻撃+10% + data modify storage api: Argument.UUID set value [I;1,3,232,0] + data modify storage api: Argument.Amount set value 0.1 + data modify storage api: Argument.Operation set value "multiply_base" + function api:modifier/attack/fire/add + + # MP回復量+8% + data modify storage api: Argument.UUID set value [I;1,3,232,0] + data modify storage api: Argument.Amount set value 0.08 + data modify storage api: Argument.Operation set value "multiply_base" + function api:modifier/mp_regen/add + + # 最大体力-10% + data modify storage api: Argument.UUID set value [I;1,3,232,0] + data modify storage api: Argument.Amount set value -0.1 + data modify storage api: Argument.Operation set value "multiply_base" + function api:modifier/max_health/add + +# 演出 + # 1つ目の円 + execute rotated ~0 0 positioned ^ ^0.2 ^0.8 facing entity @s feet rotated ~ ~-5 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000001 0 normal @a + execute rotated ~30 0 positioned ^ ^0.2 ^0.8 facing entity @s feet rotated ~ ~-5 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000001 0 normal @a + execute rotated ~60 0 positioned ^ ^0.2 ^0.8 facing entity @s feet rotated ~ ~-5 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000001 0 normal @a + execute rotated ~90 0 positioned ^ ^0.2 ^0.8 facing entity @s feet rotated ~ ~-5 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000001 0 normal @a + execute rotated ~120 0 positioned ^ ^0.2 ^0.8 facing entity @s feet rotated ~ ~-5 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000001 0 normal @a + execute rotated ~150 0 positioned ^ ^0.2 ^0.8 facing entity @s feet rotated ~ ~-5 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000001 0 normal @a + execute rotated ~180 0 positioned ^ ^0.2 ^0.8 facing entity @s feet rotated ~ ~-5 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000001 0 normal @a + execute rotated ~210 0 positioned ^ ^0.2 ^0.8 facing entity @s feet rotated ~ ~-5 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000001 0 normal @a + execute rotated ~240 0 positioned ^ ^0.2 ^0.8 facing entity @s feet rotated ~ ~-5 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000001 0 normal @a + execute rotated ~270 0 positioned ^ ^0.2 ^0.8 facing entity @s feet rotated ~ ~-5 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000001 0 normal @a + execute rotated ~300 0 positioned ^ ^0.2 ^0.8 facing entity @s feet rotated ~ ~-5 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000001 0 normal @a + execute rotated ~330 0 positioned ^ ^0.2 ^0.8 facing entity @s feet rotated ~ ~-5 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000001 0 normal @a + + # 2つ目の円 + execute rotated ~0 0 positioned ^ ^0.2 ^1.2 facing entity @s feet rotated ~ ~-20 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a + execute rotated ~20 0 positioned ^ ^0.2 ^1.2 facing entity @s feet rotated ~ ~-20 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a + execute rotated ~40 0 positioned ^ ^0.2 ^1.2 facing entity @s feet rotated ~ ~-20 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a + execute rotated ~60 0 positioned ^ ^0.2 ^1.2 facing entity @s feet rotated ~ ~-20 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a + execute rotated ~80 0 positioned ^ ^0.2 ^1.2 facing entity @s feet rotated ~ ~-20 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a + execute rotated ~100 0 positioned ^ ^0.2 ^1.2 facing entity @s feet rotated ~ ~-20 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a + execute rotated ~120 0 positioned ^ ^0.2 ^1.2 facing entity @s feet rotated ~ ~-20 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a + execute rotated ~140 0 positioned ^ ^0.2 ^1.2 facing entity @s feet rotated ~ ~-20 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a + execute rotated ~160 0 positioned ^ ^0.2 ^1.2 facing entity @s feet rotated ~ ~-20 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a + execute rotated ~180 0 positioned ^ ^0.2 ^1.2 facing entity @s feet rotated ~ ~-20 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a + execute rotated ~200 0 positioned ^ ^0.2 ^1.2 facing entity @s feet rotated ~ ~-20 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a + execute rotated ~220 0 positioned ^ ^0.2 ^1.2 facing entity @s feet rotated ~ ~-20 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a + execute rotated ~240 0 positioned ^ ^0.2 ^1.2 facing entity @s feet rotated ~ ~-20 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a + execute rotated ~260 0 positioned ^ ^0.2 ^1.2 facing entity @s feet rotated ~ ~-20 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a + execute rotated ~280 0 positioned ^ ^0.2 ^1.2 facing entity @s feet rotated ~ ~-20 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a + execute rotated ~300 0 positioned ^ ^0.2 ^1.2 facing entity @s feet rotated ~ ~-20 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a + execute rotated ~320 0 positioned ^ ^0.2 ^1.2 facing entity @s feet rotated ~ ~-20 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a + execute rotated ~340 0 positioned ^ ^0.2 ^1.2 facing entity @s feet rotated ~ ~-20 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a + + # 2つ目の円 + execute rotated ~0 0 positioned ^ ^0.2 ^1.6 facing entity @s feet rotated ~ ~-40 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a + execute rotated ~10 0 positioned ^ ^0.2 ^1.6 facing entity @s feet rotated ~ ~-40 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a + execute rotated ~20 0 positioned ^ ^0.2 ^1.6 facing entity @s feet rotated ~ ~-40 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a + execute rotated ~30 0 positioned ^ ^0.2 ^1.6 facing entity @s feet rotated ~ ~-40 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a + execute rotated ~40 0 positioned ^ ^0.2 ^1.6 facing entity @s feet rotated ~ ~-40 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a + execute rotated ~50 0 positioned ^ ^0.2 ^1.6 facing entity @s feet rotated ~ ~-40 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a + execute rotated ~60 0 positioned ^ ^0.2 ^1.6 facing entity @s feet rotated ~ ~-40 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a + execute rotated ~70 0 positioned ^ ^0.2 ^1.6 facing entity @s feet rotated ~ ~-40 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a + execute rotated ~80 0 positioned ^ ^0.2 ^1.6 facing entity @s feet rotated ~ ~-40 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a + execute rotated ~90 0 positioned ^ ^0.2 ^1.6 facing entity @s feet rotated ~ ~-40 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a + execute rotated ~100 0 positioned ^ ^0.2 ^1.6 facing entity @s feet rotated ~ ~-40 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a + execute rotated ~110 0 positioned ^ ^0.2 ^1.6 facing entity @s feet rotated ~ ~-40 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a + execute rotated ~120 0 positioned ^ ^0.2 ^1.6 facing entity @s feet rotated ~ ~-40 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a + execute rotated ~130 0 positioned ^ ^0.2 ^1.6 facing entity @s feet rotated ~ ~-40 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a + execute rotated ~140 0 positioned ^ ^0.2 ^1.6 facing entity @s feet rotated ~ ~-40 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a + execute rotated ~150 0 positioned ^ ^0.2 ^1.6 facing entity @s feet rotated ~ ~-40 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a + execute rotated ~160 0 positioned ^ ^0.2 ^1.6 facing entity @s feet rotated ~ ~-40 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a + execute rotated ~170 0 positioned ^ ^0.2 ^1.6 facing entity @s feet rotated ~ ~-40 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a + execute rotated ~180 0 positioned ^ ^0.2 ^1.6 facing entity @s feet rotated ~ ~-40 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a + execute rotated ~190 0 positioned ^ ^0.2 ^1.6 facing entity @s feet rotated ~ ~-40 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a + execute rotated ~200 0 positioned ^ ^0.2 ^1.6 facing entity @s feet rotated ~ ~-40 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a + execute rotated ~210 0 positioned ^ ^0.2 ^1.6 facing entity @s feet rotated ~ ~-40 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a + execute rotated ~220 0 positioned ^ ^0.2 ^1.6 facing entity @s feet rotated ~ ~-40 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a + execute rotated ~230 0 positioned ^ ^0.2 ^1.6 facing entity @s feet rotated ~ ~-40 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a + execute rotated ~240 0 positioned ^ ^0.2 ^1.6 facing entity @s feet rotated ~ ~-40 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a + execute rotated ~250 0 positioned ^ ^0.2 ^1.6 facing entity @s feet rotated ~ ~-40 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a + execute rotated ~260 0 positioned ^ ^0.2 ^1.6 facing entity @s feet rotated ~ ~-40 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a + execute rotated ~270 0 positioned ^ ^0.2 ^1.6 facing entity @s feet rotated ~ ~-40 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a + execute rotated ~280 0 positioned ^ ^0.2 ^1.6 facing entity @s feet rotated ~ ~-40 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a + execute rotated ~290 0 positioned ^ ^0.2 ^1.6 facing entity @s feet rotated ~ ~-40 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a + execute rotated ~300 0 positioned ^ ^0.2 ^1.6 facing entity @s feet rotated ~ ~-40 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a + execute rotated ~310 0 positioned ^ ^0.2 ^1.6 facing entity @s feet rotated ~ ~-40 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a + execute rotated ~320 0 positioned ^ ^0.2 ^1.6 facing entity @s feet rotated ~ ~-40 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a + execute rotated ~330 0 positioned ^ ^0.2 ^1.6 facing entity @s feet rotated ~ ~-40 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a + execute rotated ~340 0 positioned ^ ^0.2 ^1.6 facing entity @s feet rotated ~ ~-40 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a + execute rotated ~350 0 positioned ^ ^0.2 ^1.6 facing entity @s feet rotated ~ ~-40 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a + + # 4つ目の円 + execute rotated ~0 0 positioned ^ ^0.2 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~5 0 positioned ^ ^0.2 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~10 0 positioned ^ ^0.2 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~15 0 positioned ^ ^0.2 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~20 0 positioned ^ ^0.2 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~25 0 positioned ^ ^0.2 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~30 0 positioned ^ ^0.2 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~35 0 positioned ^ ^0.2 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~40 0 positioned ^ ^0.2 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~45 0 positioned ^ ^0.2 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~50 0 positioned ^ ^0.2 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~55 0 positioned ^ ^0.2 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~60 0 positioned ^ ^0.2 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~65 0 positioned ^ ^0.2 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~70 0 positioned ^ ^0.2 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~75 0 positioned ^ ^0.2 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~80 0 positioned ^ ^0.2 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~85 0 positioned ^ ^0.2 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~90 0 positioned ^ ^0.2 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~95 0 positioned ^ ^0.2 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~100 0 positioned ^ ^0.2 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~105 0 positioned ^ ^0.2 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~110 0 positioned ^ ^0.2 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~115 0 positioned ^ ^0.2 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~120 0 positioned ^ ^0.2 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~125 0 positioned ^ ^0.2 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~130 0 positioned ^ ^0.2 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~135 0 positioned ^ ^0.2 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~140 0 positioned ^ ^0.2 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~145 0 positioned ^ ^0.2 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~150 0 positioned ^ ^0.2 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~155 0 positioned ^ ^0.2 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~160 0 positioned ^ ^0.2 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~165 0 positioned ^ ^0.2 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~170 0 positioned ^ ^0.2 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~175 0 positioned ^ ^0.2 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~180 0 positioned ^ ^0.2 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~185 0 positioned ^ ^0.2 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~190 0 positioned ^ ^0.2 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~195 0 positioned ^ ^0.2 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~200 0 positioned ^ ^0.2 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~205 0 positioned ^ ^0.2 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~210 0 positioned ^ ^0.2 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~215 0 positioned ^ ^0.2 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~220 0 positioned ^ ^0.2 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~225 0 positioned ^ ^0.2 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~230 0 positioned ^ ^0.2 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~235 0 positioned ^ ^0.2 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~240 0 positioned ^ ^0.2 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~245 0 positioned ^ ^0.2 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~250 0 positioned ^ ^0.2 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~255 0 positioned ^ ^0.2 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~260 0 positioned ^ ^0.2 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~265 0 positioned ^ ^0.2 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~270 0 positioned ^ ^0.2 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~275 0 positioned ^ ^0.2 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~280 0 positioned ^ ^0.2 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~285 0 positioned ^ ^0.2 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~290 0 positioned ^ ^0.2 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~295 0 positioned ^ ^0.2 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~300 0 positioned ^ ^0.2 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~305 0 positioned ^ ^0.2 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~310 0 positioned ^ ^0.2 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~315 0 positioned ^ ^0.2 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~320 0 positioned ^ ^0.2 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~325 0 positioned ^ ^0.2 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~330 0 positioned ^ ^0.2 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~335 0 positioned ^ ^0.2 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~340 0 positioned ^ ^0.2 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~345 0 positioned ^ ^0.2 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~350 0 positioned ^ ^0.2 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~355 0 positioned ^ ^0.2 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + + # ここより下はsoul_fire ver + + # 1つ目の円 + execute rotated ~0 0 positioned ^ ^0 ^0.8 facing entity @s feet rotated ~ ~-5 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000001 0 normal @a + execute rotated ~30 0 positioned ^ ^0 ^0.8 facing entity @s feet rotated ~ ~-5 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000001 0 normal @a + execute rotated ~60 0 positioned ^ ^0 ^0.8 facing entity @s feet rotated ~ ~-5 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000001 0 normal @a + execute rotated ~90 0 positioned ^ ^0 ^0.8 facing entity @s feet rotated ~ ~-5 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000001 0 normal @a + execute rotated ~120 0 positioned ^ ^0 ^0.8 facing entity @s feet rotated ~ ~-5 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000001 0 normal @a + execute rotated ~150 0 positioned ^ ^0 ^0.8 facing entity @s feet rotated ~ ~-5 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000001 0 normal @a + execute rotated ~180 0 positioned ^ ^0 ^0.8 facing entity @s feet rotated ~ ~-5 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000001 0 normal @a + execute rotated ~210 0 positioned ^ ^0 ^0.8 facing entity @s feet rotated ~ ~-5 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000001 0 normal @a + execute rotated ~240 0 positioned ^ ^0 ^0.8 facing entity @s feet rotated ~ ~-5 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000001 0 normal @a + execute rotated ~270 0 positioned ^ ^0 ^0.8 facing entity @s feet rotated ~ ~-5 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000001 0 normal @a + execute rotated ~300 0 positioned ^ ^0 ^0.8 facing entity @s feet rotated ~ ~-5 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000001 0 normal @a + execute rotated ~330 0 positioned ^ ^0 ^0.8 facing entity @s feet rotated ~ ~-5 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000001 0 normal @a + + # 2つ目の円 + execute rotated ~0 0 positioned ^ ^0 ^1.2 facing entity @s feet rotated ~ ~-20 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a + execute rotated ~20 0 positioned ^ ^0 ^1.2 facing entity @s feet rotated ~ ~-20 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a + execute rotated ~40 0 positioned ^ ^0 ^1.2 facing entity @s feet rotated ~ ~-20 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a + execute rotated ~60 0 positioned ^ ^0 ^1.2 facing entity @s feet rotated ~ ~-20 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a + execute rotated ~80 0 positioned ^ ^0 ^1.2 facing entity @s feet rotated ~ ~-20 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a + execute rotated ~100 0 positioned ^ ^0 ^1.2 facing entity @s feet rotated ~ ~-20 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a + execute rotated ~120 0 positioned ^ ^0 ^1.2 facing entity @s feet rotated ~ ~-20 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a + execute rotated ~140 0 positioned ^ ^0 ^1.2 facing entity @s feet rotated ~ ~-20 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a + execute rotated ~160 0 positioned ^ ^0 ^1.2 facing entity @s feet rotated ~ ~-20 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a + execute rotated ~180 0 positioned ^ ^0 ^1.2 facing entity @s feet rotated ~ ~-20 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a + execute rotated ~200 0 positioned ^ ^0 ^1.2 facing entity @s feet rotated ~ ~-20 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a + execute rotated ~220 0 positioned ^ ^0 ^1.2 facing entity @s feet rotated ~ ~-20 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a + execute rotated ~240 0 positioned ^ ^0 ^1.2 facing entity @s feet rotated ~ ~-20 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a + execute rotated ~260 0 positioned ^ ^0 ^1.2 facing entity @s feet rotated ~ ~-20 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a + execute rotated ~280 0 positioned ^ ^0 ^1.2 facing entity @s feet rotated ~ ~-20 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a + execute rotated ~300 0 positioned ^ ^0 ^1.2 facing entity @s feet rotated ~ ~-20 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a + execute rotated ~320 0 positioned ^ ^0 ^1.2 facing entity @s feet rotated ~ ~-20 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a + execute rotated ~340 0 positioned ^ ^0 ^1.2 facing entity @s feet rotated ~ ~-20 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a + + # 2つ目の円 + execute rotated ~0 0 positioned ^ ^0 ^1.6 facing entity @s feet rotated ~ ~-40 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a + execute rotated ~10 0 positioned ^ ^0 ^1.6 facing entity @s feet rotated ~ ~-40 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a + execute rotated ~20 0 positioned ^ ^0 ^1.6 facing entity @s feet rotated ~ ~-40 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a + execute rotated ~30 0 positioned ^ ^0 ^1.6 facing entity @s feet rotated ~ ~-40 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a + execute rotated ~40 0 positioned ^ ^0 ^1.6 facing entity @s feet rotated ~ ~-40 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a + execute rotated ~50 0 positioned ^ ^0 ^1.6 facing entity @s feet rotated ~ ~-40 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a + execute rotated ~60 0 positioned ^ ^0 ^1.6 facing entity @s feet rotated ~ ~-40 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a + execute rotated ~70 0 positioned ^ ^0 ^1.6 facing entity @s feet rotated ~ ~-40 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a + execute rotated ~80 0 positioned ^ ^0 ^1.6 facing entity @s feet rotated ~ ~-40 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a + execute rotated ~90 0 positioned ^ ^0 ^1.6 facing entity @s feet rotated ~ ~-40 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a + execute rotated ~100 0 positioned ^ ^0 ^1.6 facing entity @s feet rotated ~ ~-40 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a + execute rotated ~110 0 positioned ^ ^0 ^1.6 facing entity @s feet rotated ~ ~-40 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a + execute rotated ~120 0 positioned ^ ^0 ^1.6 facing entity @s feet rotated ~ ~-40 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a + execute rotated ~130 0 positioned ^ ^0 ^1.6 facing entity @s feet rotated ~ ~-40 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a + execute rotated ~140 0 positioned ^ ^0 ^1.6 facing entity @s feet rotated ~ ~-40 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a + execute rotated ~150 0 positioned ^ ^0 ^1.6 facing entity @s feet rotated ~ ~-40 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a + execute rotated ~160 0 positioned ^ ^0 ^1.6 facing entity @s feet rotated ~ ~-40 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a + execute rotated ~170 0 positioned ^ ^0 ^1.6 facing entity @s feet rotated ~ ~-40 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a + execute rotated ~180 0 positioned ^ ^0 ^1.6 facing entity @s feet rotated ~ ~-40 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a + execute rotated ~190 0 positioned ^ ^0 ^1.6 facing entity @s feet rotated ~ ~-40 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a + execute rotated ~200 0 positioned ^ ^0 ^1.6 facing entity @s feet rotated ~ ~-40 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a + execute rotated ~210 0 positioned ^ ^0 ^1.6 facing entity @s feet rotated ~ ~-40 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a + execute rotated ~220 0 positioned ^ ^0 ^1.6 facing entity @s feet rotated ~ ~-40 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a + execute rotated ~230 0 positioned ^ ^0 ^1.6 facing entity @s feet rotated ~ ~-40 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a + execute rotated ~240 0 positioned ^ ^0 ^1.6 facing entity @s feet rotated ~ ~-40 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a + execute rotated ~250 0 positioned ^ ^0 ^1.6 facing entity @s feet rotated ~ ~-40 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a + execute rotated ~260 0 positioned ^ ^0 ^1.6 facing entity @s feet rotated ~ ~-40 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000003 0 normal @a + execute rotated ~270 0 positioned ^ ^0 ^1.6 facing entity @s feet rotated ~ ~-40 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a + execute rotated ~280 0 positioned ^ ^0 ^1.6 facing entity @s feet rotated ~ ~-40 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a + execute rotated ~290 0 positioned ^ ^0 ^1.6 facing entity @s feet rotated ~ ~-40 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a + execute rotated ~300 0 positioned ^ ^0 ^1.6 facing entity @s feet rotated ~ ~-40 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a + execute rotated ~310 0 positioned ^ ^0 ^1.6 facing entity @s feet rotated ~ ~-40 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a + execute rotated ~320 0 positioned ^ ^0 ^1.6 facing entity @s feet rotated ~ ~-40 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a + execute rotated ~330 0 positioned ^ ^0 ^1.6 facing entity @s feet rotated ~ ~-40 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a + execute rotated ~340 0 positioned ^ ^0 ^1.6 facing entity @s feet rotated ~ ~-40 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a + execute rotated ~350 0 positioned ^ ^0 ^1.6 facing entity @s feet rotated ~ ~-40 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000002 0 normal @a + + # 4つ目の円 + execute rotated ~0 0 positioned ^ ^0 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~5 0 positioned ^ ^0 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~10 0 positioned ^ ^0 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~15 0 positioned ^ ^0 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~20 0 positioned ^ ^0 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~25 0 positioned ^ ^0 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~30 0 positioned ^ ^0 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~35 0 positioned ^ ^0 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~40 0 positioned ^ ^0 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~45 0 positioned ^ ^0 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~50 0 positioned ^ ^0 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~55 0 positioned ^ ^0 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~60 0 positioned ^ ^0 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~65 0 positioned ^ ^0 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~70 0 positioned ^ ^0 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~75 0 positioned ^ ^0 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~80 0 positioned ^ ^0 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~85 0 positioned ^ ^0 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~90 0 positioned ^ ^0 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~95 0 positioned ^ ^0 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~100 0 positioned ^ ^0 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~105 0 positioned ^ ^0 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~110 0 positioned ^ ^0 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~115 0 positioned ^ ^0 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~120 0 positioned ^ ^0 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~125 0 positioned ^ ^0 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~130 0 positioned ^ ^0 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~135 0 positioned ^ ^0 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~140 0 positioned ^ ^0 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~145 0 positioned ^ ^0 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~150 0 positioned ^ ^0 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~155 0 positioned ^ ^0 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~160 0 positioned ^ ^0 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~165 0 positioned ^ ^0 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~170 0 positioned ^ ^0 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~175 0 positioned ^ ^0 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~180 0 positioned ^ ^0 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~185 0 positioned ^ ^0 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~190 0 positioned ^ ^0 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~195 0 positioned ^ ^0 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~200 0 positioned ^ ^0 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~205 0 positioned ^ ^0 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~210 0 positioned ^ ^0 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~215 0 positioned ^ ^0 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~220 0 positioned ^ ^0 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~225 0 positioned ^ ^0 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~230 0 positioned ^ ^0 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~235 0 positioned ^ ^0 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~240 0 positioned ^ ^0 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~245 0 positioned ^ ^0 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~250 0 positioned ^ ^0 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~255 0 positioned ^ ^0 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~260 0 positioned ^ ^0 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~265 0 positioned ^ ^0 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~270 0 positioned ^ ^0 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~275 0 positioned ^ ^0 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~280 0 positioned ^ ^0 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~285 0 positioned ^ ^0 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~290 0 positioned ^ ^0 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~295 0 positioned ^ ^0 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~300 0 positioned ^ ^0 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~305 0 positioned ^ ^0 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~310 0 positioned ^ ^0 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~315 0 positioned ^ ^0 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~320 0 positioned ^ ^0 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~325 0 positioned ^ ^0 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~330 0 positioned ^ ^0 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~335 0 positioned ^ ^0 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~340 0 positioned ^ ^0 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~345 0 positioned ^ ^0 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~350 0 positioned ^ ^0 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a + execute rotated ~355 0 positioned ^ ^0 ^2.0 facing entity @s feet rotated ~ ~-50 run particle soul_fire_flame ~ ~ ~ ^ ^ ^300000000 0.0000000004 0 normal @a diff --git a/Asset/data/asset/functions/effect/0232.soul_fire/fullset/passive.mcfunction b/Asset/data/asset/functions/effect/0232.soul_fire/fullset/passive.mcfunction new file mode 100644 index 0000000000..77f75c7e06 --- /dev/null +++ b/Asset/data/asset/functions/effect/0232.soul_fire/fullset/passive.mcfunction @@ -0,0 +1,6 @@ +#> asset:effect/0232.soul_fire/fullset/passive +# @within function asset:effect/0232.soul_fire/tick/ + +# 演出 + particle soul ~ ~1.2 ~ 2 0.5 2 0.03 1 normal @a + particle soul_fire_flame ~ ~1.2 ~ 2 0.5 2 0.03 1 normal @a diff --git a/Asset/data/asset/functions/effect/0232.soul_fire/given/.mcfunction b/Asset/data/asset/functions/effect/0232.soul_fire/given/.mcfunction new file mode 100644 index 0000000000..d70e6c1e60 --- /dev/null +++ b/Asset/data/asset/functions/effect/0232.soul_fire/given/.mcfunction @@ -0,0 +1,11 @@ +#> asset:effect/0232.soul_fire/given/ +# +# Effectが付与された時の処理 +# +# @within function asset:effect/0232.soul_fire/_/given + +# フルセット効果を付与 + execute if data storage asset:context {Stack:4} run function asset:effect/0232.soul_fire/fullset/equip + +# スタックを記録 + data modify storage asset:context this.PrevStack set from storage asset:context Stack diff --git a/Asset/data/asset/functions/effect/0232.soul_fire/re-given/.mcfunction b/Asset/data/asset/functions/effect/0232.soul_fire/re-given/.mcfunction new file mode 100644 index 0000000000..94c5a9f41f --- /dev/null +++ b/Asset/data/asset/functions/effect/0232.soul_fire/re-given/.mcfunction @@ -0,0 +1,14 @@ +#> asset:effect/0232.soul_fire/re-given/ +# +# Effectが上書きされた時の処理 +# +# @within function asset:effect/0232.soul_fire/_/re-given + +# フルセット効果を削除 + execute if data storage asset:context PreviousField{PrevStack:4} unless data storage asset:context {Stack:4} run function asset:effect/0232.soul_fire/fullset/dis_equip + +# フルセット効果を付与 + execute unless data storage asset:context PreviousField{PrevStack:4} if data storage asset:context {Stack:4} run function asset:effect/0232.soul_fire/fullset/equip + +# スタックを記録 + data modify storage asset:context this.PrevStack set from storage asset:context Stack diff --git a/Asset/data/asset/functions/effect/0232.soul_fire/register.mcfunction b/Asset/data/asset/functions/effect/0232.soul_fire/register.mcfunction new file mode 100644 index 0000000000..67dc9aea61 --- /dev/null +++ b/Asset/data/asset/functions/effect/0232.soul_fire/register.mcfunction @@ -0,0 +1,32 @@ +#> asset:effect/0232.soul_fire/register +# +# Effectのデータを指定 +# +# @within function asset:effect/0232.soul_fire/_/register + +# ExtendsSafe (boolean) (default = false) + # data modify storage asset:effect ExtendsSafe set value true +# ID (int) + data modify storage asset:effect ID set value 232 +# 名前 (TextComponentString) + data modify storage asset:effect Name set value '{"text":"魂炎纏","color":"#01A7AC"}' +# 説明文 (TextComponentString[]) + data modify storage asset:effect Description set value ['{"text":"全てを身に纏ったとき、魂炎による追撃が発生する。"}','{"text":"最大体力 -10%","color":"red"}','{"text":"火攻撃 +10%","color":"green"}','{"text":"MP回復量 +8%","color":"green"}'] +# 効果時間 (int) (default = API || error) + data modify storage asset:effect Duration set value 2147483647 +# スタック (int) (default = API || 1) + # data modify storage asset:effect Stack set value +# 効果時間の操作方法 (default = API || "replace") + # data modify storage asset:effect DurationOperation set value +# スタックの操作方法 (default = API || "replace") + data modify storage asset:effect StackOperation set value "forceReplace" +# 最大効果時間 (int) (default = 2147483647) + # data modify storage asset:effect MaxDuration set value +# 最大スタック (int) (default = 2147483647) + data modify storage asset:effect MaxStack set value 4 +# 悪い効果か否か (boolean) + data modify storage asset:effect IsBadEffect set value false +# 死亡時のエフェクトの処理 (default = "remove") + # data modify storage asset:effect ProcessOnDied set value +# 消すのに必要なレベル (int) (default = 1) + data modify storage asset:effect RequireClearLv set value 4 diff --git a/Asset/data/asset/functions/effect/0232.soul_fire/remove/.mcfunction b/Asset/data/asset/functions/effect/0232.soul_fire/remove/.mcfunction new file mode 100644 index 0000000000..e174ce684c --- /dev/null +++ b/Asset/data/asset/functions/effect/0232.soul_fire/remove/.mcfunction @@ -0,0 +1,8 @@ +#> asset:effect/0232.soul_fire/remove/ +# +# Effectが削除された時の処理 +# +# @within function asset:effect/0232.soul_fire/_/remove + +# フルセット効果を削除 + execute if data storage asset:context {Stack:4} run function asset:effect/0232.soul_fire/fullset/dis_equip diff --git a/Asset/data/asset/functions/effect/0232.soul_fire/tick/.mcfunction b/Asset/data/asset/functions/effect/0232.soul_fire/tick/.mcfunction new file mode 100644 index 0000000000..d9fc96b486 --- /dev/null +++ b/Asset/data/asset/functions/effect/0232.soul_fire/tick/.mcfunction @@ -0,0 +1,8 @@ +#> asset:effect/0232.soul_fire/tick/ +# +# Effectのtick処理 +# +# @within function asset:effect/0232.soul_fire/_/tick + +# 演出 + execute if data storage asset:context {Stack:4} run function asset:effect/0232.soul_fire/fullset/passive diff --git a/Asset/data/asset/functions/effect/0233.flame_armor/_/given.mcfunction b/Asset/data/asset/functions/effect/0233.flame_armor/_/given.mcfunction new file mode 100644 index 0000000000..776ca5db4d --- /dev/null +++ b/Asset/data/asset/functions/effect/0233.flame_armor/_/given.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0233.flame_armor/_/given +# +# Effectが付与された時に実行されるfunction +# +# @within tag/function asset:effect/given + +execute if data storage asset:context {id:233} run function asset:effect/0233.flame_armor/given/ \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0233.flame_armor/_/re-given.mcfunction b/Asset/data/asset/functions/effect/0233.flame_armor/_/re-given.mcfunction new file mode 100644 index 0000000000..41105217c4 --- /dev/null +++ b/Asset/data/asset/functions/effect/0233.flame_armor/_/re-given.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0233.flame_armor/_/re-given +# +# Effectが上書きされた時に実行されるfunction +# +# @within tag/function asset:effect/re-given + +execute if data storage asset:context {id:233} run function asset:effect/0233.flame_armor/re-given/ \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0233.flame_armor/_/register.mcfunction b/Asset/data/asset/functions/effect/0233.flame_armor/_/register.mcfunction new file mode 100644 index 0000000000..ccdaa9b619 --- /dev/null +++ b/Asset/data/asset/functions/effect/0233.flame_armor/_/register.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0233.flame_armor/_/register +# +# +# +# @within tag/function asset:effect/register + +execute if data storage asset:context {id:233} run function asset:effect/0233.flame_armor/register \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0233.flame_armor/_/remove.mcfunction b/Asset/data/asset/functions/effect/0233.flame_armor/_/remove.mcfunction new file mode 100644 index 0000000000..46f9703926 --- /dev/null +++ b/Asset/data/asset/functions/effect/0233.flame_armor/_/remove.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0233.flame_armor/_/remove +# +# Effectが神器や牛乳によって削除された時に実行されるfunction +# +# @within tag/function asset:effect/remove + +execute if data storage asset:context {id:233} run function asset:effect/0233.flame_armor/remove/ \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0233.flame_armor/fullset/dis_equip.mcfunction b/Asset/data/asset/functions/effect/0233.flame_armor/fullset/dis_equip.mcfunction new file mode 100644 index 0000000000..f3c665d71c --- /dev/null +++ b/Asset/data/asset/functions/effect/0233.flame_armor/fullset/dis_equip.mcfunction @@ -0,0 +1,12 @@ +#> asset:effect/0233.flame_armor/fullset/dis_equip +# @within function +# asset:effect/0233.flame_armor/re-given/ +# asset:effect/0233.flame_armor/remove/ + +# 火攻撃+3% + data modify storage api: Argument.UUID set value [I;1,3,233,0] + function api:modifier/attack/fire/remove + +# 火耐性+3% + data modify storage api: Argument.UUID set value [I;1,3,233,0] + function api:modifier/defense/fire/remove diff --git a/Asset/data/asset/functions/artifact/0625.flame_armor/trigger/4.fullset.mcfunction b/Asset/data/asset/functions/effect/0233.flame_armor/fullset/equip.mcfunction similarity index 51% rename from Asset/data/asset/functions/artifact/0625.flame_armor/trigger/4.fullset.mcfunction rename to Asset/data/asset/functions/effect/0233.flame_armor/fullset/equip.mcfunction index 558c1f7d10..bf44523d43 100644 --- a/Asset/data/asset/functions/artifact/0625.flame_armor/trigger/4.fullset.mcfunction +++ b/Asset/data/asset/functions/effect/0233.flame_armor/fullset/equip.mcfunction @@ -1,28 +1,18 @@ -#> asset:artifact/0625.flame_armor/trigger/4.fullset -# -# -# -# @within function -# asset:artifact/0624.flame_helm/trigger/3.main -# asset:artifact/0625.flame_armor/trigger/3.main -# asset:artifact/0626.flame_leggings/trigger/3.main -# asset:artifact/0627.flame_boots/trigger/3.main +#> asset:effect/0233.flame_armor/fullset/equip +# @within function asset:effect/0233.flame_armor/*given/ -# Tag付与 - tag @s add HD.Fullset - -# 火耐性+3% - data modify storage api: Argument.UUID set value [I;1,1,625,0] +# 火攻撃+3% + data modify storage api: Argument.UUID set value [I;1,3,233,0] data modify storage api: Argument.Amount set value 0.03 data modify storage api: Argument.Operation set value "multiply_base" - function api:modifier/defense/fire/add + function api:modifier/attack/fire/add # 火耐性+3% - data modify storage api: Argument.UUID set value [I;1,1,625,0] + data modify storage api: Argument.UUID set value [I;1,3,233,0] data modify storage api: Argument.Amount set value 0.03 data modify storage api: Argument.Operation set value "multiply_base" - function api:modifier/attack/fire/add + function api:modifier/defense/fire/add # 演出 particle flame ~ ~1.2 ~ 0.4 0.5 0.4 0 20 normal @a - playsound minecraft:entity.blaze.shoot player @a ~ ~ ~ 1 0.2 0 \ No newline at end of file + playsound minecraft:entity.blaze.shoot player @a ~ ~ ~ 1 0.2 0 diff --git a/Asset/data/asset/functions/effect/0233.flame_armor/given/.mcfunction b/Asset/data/asset/functions/effect/0233.flame_armor/given/.mcfunction new file mode 100644 index 0000000000..467f3f04e3 --- /dev/null +++ b/Asset/data/asset/functions/effect/0233.flame_armor/given/.mcfunction @@ -0,0 +1,11 @@ +#> asset:effect/0233.flame_armor/given/ +# +# Effectが付与された時の処理 +# +# @within function asset:effect/0233.flame_armor/_/given + +# フルセット効果を付与 + execute if data storage asset:context {Stack:4} run function asset:effect/0233.flame_armor/fullset/equip + +# スタックを記録 + data modify storage asset:context this.PrevStack set from storage asset:context Stack diff --git a/Asset/data/asset/functions/effect/0233.flame_armor/re-given/.mcfunction b/Asset/data/asset/functions/effect/0233.flame_armor/re-given/.mcfunction new file mode 100644 index 0000000000..a449898098 --- /dev/null +++ b/Asset/data/asset/functions/effect/0233.flame_armor/re-given/.mcfunction @@ -0,0 +1,14 @@ +#> asset:effect/0233.flame_armor/re-given/ +# +# Effectが上書きされた時の処理 +# +# @within function asset:effect/0233.flame_armor/_/re-given + +# フルセット効果を削除 + execute if data storage asset:context PreviousField{PrevStack:4} unless data storage asset:context {Stack:4} run function asset:effect/0233.flame_armor/fullset/dis_equip + +# フルセット効果を付与 + execute unless data storage asset:context PreviousField{PrevStack:4} if data storage asset:context {Stack:4} run function asset:effect/0233.flame_armor/fullset/equip + +# スタックを記録 + data modify storage asset:context this.PrevStack set from storage asset:context Stack diff --git a/Asset/data/asset/functions/effect/0233.flame_armor/register.mcfunction b/Asset/data/asset/functions/effect/0233.flame_armor/register.mcfunction new file mode 100644 index 0000000000..3849e0ca3d --- /dev/null +++ b/Asset/data/asset/functions/effect/0233.flame_armor/register.mcfunction @@ -0,0 +1,32 @@ +#> asset:effect/0233.flame_armor/register +# +# Effectのデータを指定 +# +# @within function asset:effect/0233.flame_armor/_/register + +# ExtendsSafe (boolean) (default = false) + # data modify storage asset:effect ExtendsSafe set value true +# ID (int) + data modify storage asset:effect ID set value 233 +# 名前 (TextComponentString) + data modify storage asset:effect Name set value '{"text":"フレイムアーマー","color":"red"}' +# 説明文 (TextComponentString[]) + data modify storage asset:effect Description set value ['{"text":"火攻撃 +3%","color":"green"}','{"text":"火耐性 +3%","color":"green"}'] +# 効果時間 (int) (default = API || error) + data modify storage asset:effect Duration set value 2147483647 +# スタック (int) (default = API || 1) + # data modify storage asset:effect Stack set value +# 効果時間の操作方法 (default = API || "replace") + # data modify storage asset:effect DurationOperation set value +# スタックの操作方法 (default = API || "replace") + data modify storage asset:effect StackOperation set value "forceReplace" +# 最大効果時間 (int) (default = 2147483647) + # data modify storage asset:effect MaxDuration set value +# 最大スタック (int) (default = 2147483647) + data modify storage asset:effect MaxStack set value 4 +# 悪い効果か否か (boolean) + data modify storage asset:effect IsBadEffect set value false +# 死亡時のエフェクトの処理 (default = "remove") + # data modify storage asset:effect ProcessOnDied set value +# 消すのに必要なレベル (int) (default = 1) + data modify storage asset:effect RequireClearLv set value 4 diff --git a/Asset/data/asset/functions/effect/0233.flame_armor/remove/.mcfunction b/Asset/data/asset/functions/effect/0233.flame_armor/remove/.mcfunction new file mode 100644 index 0000000000..3b9e302398 --- /dev/null +++ b/Asset/data/asset/functions/effect/0233.flame_armor/remove/.mcfunction @@ -0,0 +1,11 @@ +#> asset:effect/0233.flame_armor/remove/ +# +# Effectが削除された時の処理 +# +# @within function asset:effect/0233.flame_armor/_/remove + +# フルセット効果を削除 + execute if data storage asset:context {Stack:4} run function asset:effect/0233.flame_armor/fullset/dis_equip + +# スタックを記録 + data modify storage asset:context this.PrevStack set from storage asset:context Stack diff --git a/Asset/data/asset/functions/effect/0234.ice_armor/_/given.mcfunction b/Asset/data/asset/functions/effect/0234.ice_armor/_/given.mcfunction new file mode 100644 index 0000000000..13295ef1ca --- /dev/null +++ b/Asset/data/asset/functions/effect/0234.ice_armor/_/given.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0234.ice_armor/_/given +# +# Effectが付与された時に実行されるfunction +# +# @within tag/function asset:effect/given + +execute if data storage asset:context {id:234} run function asset:effect/0234.ice_armor/given/ \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0234.ice_armor/_/re-given.mcfunction b/Asset/data/asset/functions/effect/0234.ice_armor/_/re-given.mcfunction new file mode 100644 index 0000000000..cc6f58dd7e --- /dev/null +++ b/Asset/data/asset/functions/effect/0234.ice_armor/_/re-given.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0234.ice_armor/_/re-given +# +# Effectが上書きされた時に実行されるfunction +# +# @within tag/function asset:effect/re-given + +execute if data storage asset:context {id:234} run function asset:effect/0234.ice_armor/re-given/ \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0234.ice_armor/_/register.mcfunction b/Asset/data/asset/functions/effect/0234.ice_armor/_/register.mcfunction new file mode 100644 index 0000000000..432c467dd2 --- /dev/null +++ b/Asset/data/asset/functions/effect/0234.ice_armor/_/register.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0234.ice_armor/_/register +# +# +# +# @within tag/function asset:effect/register + +execute if data storage asset:context {id:234} run function asset:effect/0234.ice_armor/register \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0234.ice_armor/_/remove.mcfunction b/Asset/data/asset/functions/effect/0234.ice_armor/_/remove.mcfunction new file mode 100644 index 0000000000..718d989c2d --- /dev/null +++ b/Asset/data/asset/functions/effect/0234.ice_armor/_/remove.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0234.ice_armor/_/remove +# +# Effectが神器や牛乳によって削除された時に実行されるfunction +# +# @within tag/function asset:effect/remove + +execute if data storage asset:context {id:234} run function asset:effect/0234.ice_armor/remove/ \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0234.ice_armor/fullset/dis_equip.mcfunction b/Asset/data/asset/functions/effect/0234.ice_armor/fullset/dis_equip.mcfunction new file mode 100644 index 0000000000..96ae00f390 --- /dev/null +++ b/Asset/data/asset/functions/effect/0234.ice_armor/fullset/dis_equip.mcfunction @@ -0,0 +1,12 @@ +#> asset:effect/0234.ice_armor/fullset/dis_equip +# @within function +# asset:effect/0234.ice_armor/re-given/ +# asset:effect/0234.ice_armor/remove/ + +# 水攻撃+3% + data modify storage api: Argument.UUID set value [I;1,3,234,0] + function api:modifier/attack/water/remove + +# 水耐性+3% + data modify storage api: Argument.UUID set value [I;1,3,234,0] + function api:modifier/defense/water/remove diff --git a/Asset/data/asset/functions/artifact/0629.ice_armor/trigger/4.fullset.mcfunction b/Asset/data/asset/functions/effect/0234.ice_armor/fullset/equip.mcfunction similarity index 52% rename from Asset/data/asset/functions/artifact/0629.ice_armor/trigger/4.fullset.mcfunction rename to Asset/data/asset/functions/effect/0234.ice_armor/fullset/equip.mcfunction index 2b74a839a0..370779ad2f 100644 --- a/Asset/data/asset/functions/artifact/0629.ice_armor/trigger/4.fullset.mcfunction +++ b/Asset/data/asset/functions/effect/0234.ice_armor/fullset/equip.mcfunction @@ -1,29 +1,19 @@ -#> asset:artifact/0629.ice_armor/trigger/4.fullset -# -# -# -# @within function -# asset:artifact/0628.ice_helm/trigger/3.main -# asset:artifact/0629.ice_armor/trigger/3.main -# asset:artifact/0630.ice_leggings/trigger/3.main -# asset:artifact/0631.ice_boots/trigger/3.main +#> asset:effect/0234.ice_armor/fullset/equip +# @within function asset:effect/0234.ice_armor/*given/ -# Tag付与 - tag @s add HH.Fullset - -# 水耐性+3% - data modify storage api: Argument.UUID set value [I;1,1,629,0] +# 水攻撃+3% + data modify storage api: Argument.UUID set value [I;1,3,234,0] data modify storage api: Argument.Amount set value 0.03 data modify storage api: Argument.Operation set value "multiply_base" - function api:modifier/defense/water/add + function api:modifier/attack/water/add -# 水攻撃+3% - data modify storage api: Argument.UUID set value [I;1,1,629,0] +# 水耐性+3% + data modify storage api: Argument.UUID set value [I;1,3,234,0] data modify storage api: Argument.Amount set value 0.03 data modify storage api: Argument.Operation set value "multiply_base" - function api:modifier/attack/water/add + function api:modifier/defense/water/add # 演出 particle falling_dust diamond_block ~ ~1.2 ~ 0.4 0.5 0.4 0 20 normal @a particle falling_dust snow_block ~ ~1.2 ~ 0.4 0.5 0.4 0 20 normal @a - playsound block.glass.break player @a ~ ~ ~ 0.4 1.6 0 \ No newline at end of file + playsound block.glass.break player @a ~ ~ ~ 0.4 1.6 0 diff --git a/Asset/data/asset/functions/effect/0234.ice_armor/given/.mcfunction b/Asset/data/asset/functions/effect/0234.ice_armor/given/.mcfunction new file mode 100644 index 0000000000..527a9b07f7 --- /dev/null +++ b/Asset/data/asset/functions/effect/0234.ice_armor/given/.mcfunction @@ -0,0 +1,11 @@ +#> asset:effect/0234.ice_armor/given/ +# +# Effectが付与された時の処理 +# +# @within function asset:effect/0234.ice_armor/_/given + +# フルセット効果を付与 + execute if data storage asset:context {Stack:4} run function asset:effect/0234.ice_armor/fullset/equip + +# スタックを記録 + data modify storage asset:context this.PrevStack set from storage asset:context Stack diff --git a/Asset/data/asset/functions/effect/0234.ice_armor/re-given/.mcfunction b/Asset/data/asset/functions/effect/0234.ice_armor/re-given/.mcfunction new file mode 100644 index 0000000000..92571a3be3 --- /dev/null +++ b/Asset/data/asset/functions/effect/0234.ice_armor/re-given/.mcfunction @@ -0,0 +1,14 @@ +#> asset:effect/0234.ice_armor/re-given/ +# +# Effectが上書きされた時の処理 +# +# @within function asset:effect/0234.ice_armor/_/re-given + +# フルセット効果を削除 + execute if data storage asset:context PreviousField{PrevStack:4} unless data storage asset:context {Stack:4} run function asset:effect/0234.ice_armor/fullset/dis_equip + +# フルセット効果を付与 + execute unless data storage asset:context PreviousField{PrevStack:4} if data storage asset:context {Stack:4} run function asset:effect/0234.ice_armor/fullset/equip + +# スタックを記録 + data modify storage asset:context this.PrevStack set from storage asset:context Stack diff --git a/Asset/data/asset/functions/effect/0234.ice_armor/register.mcfunction b/Asset/data/asset/functions/effect/0234.ice_armor/register.mcfunction new file mode 100644 index 0000000000..cf87210ca7 --- /dev/null +++ b/Asset/data/asset/functions/effect/0234.ice_armor/register.mcfunction @@ -0,0 +1,32 @@ +#> asset:effect/0234.ice_armor/register +# +# Effectのデータを指定 +# +# @within function asset:effect/0234.ice_armor/_/register + +# ExtendsSafe (boolean) (default = false) + # data modify storage asset:effect ExtendsSafe set value true +# ID (int) + data modify storage asset:effect ID set value 234 +# 名前 (TextComponentString) + data modify storage asset:effect Name set value '{"text":"アイスアーマー","color":"aqua"}' +# 説明文 (TextComponentString[]) + data modify storage asset:effect Description set value ['{"text":"水攻撃 +3%","color":"green"}','{"text":"水耐性 +3%","color":"green"}'] +# 効果時間 (int) (default = API || error) + data modify storage asset:effect Duration set value 2147483647 +# スタック (int) (default = API || 1) + # data modify storage asset:effect Stack set value +# 効果時間の操作方法 (default = API || "replace") + # data modify storage asset:effect DurationOperation set value +# スタックの操作方法 (default = API || "replace") + data modify storage asset:effect StackOperation set value "forceReplace" +# 最大効果時間 (int) (default = 2147483647) + # data modify storage asset:effect MaxDuration set value +# 最大スタック (int) (default = 2147483647) + data modify storage asset:effect MaxStack set value 4 +# 悪い効果か否か (boolean) + data modify storage asset:effect IsBadEffect set value false +# 死亡時のエフェクトの処理 (default = "remove") + # data modify storage asset:effect ProcessOnDied set value +# 消すのに必要なレベル (int) (default = 1) + data modify storage asset:effect RequireClearLv set value 4 diff --git a/Asset/data/asset/functions/effect/0234.ice_armor/remove/.mcfunction b/Asset/data/asset/functions/effect/0234.ice_armor/remove/.mcfunction new file mode 100644 index 0000000000..6a5c37e48d --- /dev/null +++ b/Asset/data/asset/functions/effect/0234.ice_armor/remove/.mcfunction @@ -0,0 +1,11 @@ +#> asset:effect/0234.ice_armor/remove/ +# +# Effectが削除された時の処理 +# +# @within function asset:effect/0234.ice_armor/_/remove + +# フルセット効果を削除 + execute if data storage asset:context {Stack:4} run function asset:effect/0234.ice_armor/fullset/dis_equip + +# スタックを記録 + data modify storage asset:context this.PrevStack set from storage asset:context Stack diff --git a/Asset/data/asset/functions/effect/0235.elec_armor/_/given.mcfunction b/Asset/data/asset/functions/effect/0235.elec_armor/_/given.mcfunction new file mode 100644 index 0000000000..41bbdf0704 --- /dev/null +++ b/Asset/data/asset/functions/effect/0235.elec_armor/_/given.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0235.elec_armor/_/given +# +# Effectが付与された時に実行されるfunction +# +# @within tag/function asset:effect/given + +execute if data storage asset:context {id:235} run function asset:effect/0235.elec_armor/given/ \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0235.elec_armor/_/re-given.mcfunction b/Asset/data/asset/functions/effect/0235.elec_armor/_/re-given.mcfunction new file mode 100644 index 0000000000..a36e92ace4 --- /dev/null +++ b/Asset/data/asset/functions/effect/0235.elec_armor/_/re-given.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0235.elec_armor/_/re-given +# +# Effectが上書きされた時に実行されるfunction +# +# @within tag/function asset:effect/re-given + +execute if data storage asset:context {id:235} run function asset:effect/0235.elec_armor/re-given/ \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0235.elec_armor/_/register.mcfunction b/Asset/data/asset/functions/effect/0235.elec_armor/_/register.mcfunction new file mode 100644 index 0000000000..a41258e0d3 --- /dev/null +++ b/Asset/data/asset/functions/effect/0235.elec_armor/_/register.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0235.elec_armor/_/register +# +# +# +# @within tag/function asset:effect/register + +execute if data storage asset:context {id:235} run function asset:effect/0235.elec_armor/register \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0235.elec_armor/_/remove.mcfunction b/Asset/data/asset/functions/effect/0235.elec_armor/_/remove.mcfunction new file mode 100644 index 0000000000..8ca32a41cf --- /dev/null +++ b/Asset/data/asset/functions/effect/0235.elec_armor/_/remove.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0235.elec_armor/_/remove +# +# Effectが神器や牛乳によって削除された時に実行されるfunction +# +# @within tag/function asset:effect/remove + +execute if data storage asset:context {id:235} run function asset:effect/0235.elec_armor/remove/ \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0235.elec_armor/fullset/dis_equip.mcfunction b/Asset/data/asset/functions/effect/0235.elec_armor/fullset/dis_equip.mcfunction new file mode 100644 index 0000000000..a797ddbd0c --- /dev/null +++ b/Asset/data/asset/functions/effect/0235.elec_armor/fullset/dis_equip.mcfunction @@ -0,0 +1,12 @@ +#> asset:effect/0235.elec_armor/fullset/dis_equip +# @within function +# asset:effect/0235.elec_armor/re-given/ +# asset:effect/0235.elec_armor/remove/ + +# 雷攻撃+3% + data modify storage api: Argument.UUID set value [I;1,3,235,0] + function api:modifier/attack/thunder/remove + +# 雷耐性+3% + data modify storage api: Argument.UUID set value [I;1,3,235,0] + function api:modifier/defense/thunder/remove diff --git a/Asset/data/asset/functions/artifact/0633.elec_armor/trigger/4.fullset.mcfunction b/Asset/data/asset/functions/effect/0235.elec_armor/fullset/equip.mcfunction similarity index 54% rename from Asset/data/asset/functions/artifact/0633.elec_armor/trigger/4.fullset.mcfunction rename to Asset/data/asset/functions/effect/0235.elec_armor/fullset/equip.mcfunction index e5d9c9c8a8..2139913049 100644 --- a/Asset/data/asset/functions/artifact/0633.elec_armor/trigger/4.fullset.mcfunction +++ b/Asset/data/asset/functions/effect/0235.elec_armor/fullset/equip.mcfunction @@ -1,29 +1,19 @@ -#> asset:artifact/0633.elec_armor/trigger/4.fullset -# -# -# -# @within function -# asset:artifact/0632.elec_helm/trigger/3.main -# asset:artifact/0633.elec_armor/trigger/3.main -# asset:artifact/0634.elec_leggings/trigger/3.main -# asset:artifact/0635.elec_boots/trigger/3.main +#> asset:effect/0235.elec_armor/fullset/equip +# @within function asset:effect/0235.elec_armor/*given/ -# Tag付与 - tag @s add HL.Fullset - -# 雷耐性+3% - data modify storage api: Argument.UUID set value [I;1,1,633,0] +# 雷攻撃+3% + data modify storage api: Argument.UUID set value [I;1,3,235,0] data modify storage api: Argument.Amount set value 0.03 data modify storage api: Argument.Operation set value "multiply_base" - function api:modifier/defense/thunder/add + function api:modifier/attack/thunder/add # 雷耐性+3% - data modify storage api: Argument.UUID set value [I;1,1,633,0] + data modify storage api: Argument.UUID set value [I;1,3,235,0] data modify storage api: Argument.Amount set value 0.03 data modify storage api: Argument.Operation set value "multiply_base" - function api:modifier/attack/thunder/add + function api:modifier/defense/thunder/add # 演出 particle dust 1 1 0 1 ~ ~1.2 ~ 0.4 0.5 0.4 0 25 normal @a particle firework ~ ~1.2 ~ 0.4 0.5 0.4 0 15 normal @a - playsound minecraft:entity.firework_rocket.twinkle player @a ~ ~ ~ 0.4 1.7 0 \ No newline at end of file + playsound minecraft:entity.firework_rocket.twinkle player @a ~ ~ ~ 0.4 1.7 0 diff --git a/Asset/data/asset/functions/effect/0235.elec_armor/given/.mcfunction b/Asset/data/asset/functions/effect/0235.elec_armor/given/.mcfunction new file mode 100644 index 0000000000..325884b32b --- /dev/null +++ b/Asset/data/asset/functions/effect/0235.elec_armor/given/.mcfunction @@ -0,0 +1,11 @@ +#> asset:effect/0235.elec_armor/given/ +# +# Effectが付与された時の処理 +# +# @within function asset:effect/0235.elec_armor/_/given + +# フルセット効果を付与 + execute if data storage asset:context {Stack:4} run function asset:effect/0235.elec_armor/fullset/equip + +# スタックを記録 + data modify storage asset:context this.PrevStack set from storage asset:context Stack diff --git a/Asset/data/asset/functions/effect/0235.elec_armor/re-given/.mcfunction b/Asset/data/asset/functions/effect/0235.elec_armor/re-given/.mcfunction new file mode 100644 index 0000000000..994d55176f --- /dev/null +++ b/Asset/data/asset/functions/effect/0235.elec_armor/re-given/.mcfunction @@ -0,0 +1,14 @@ +#> asset:effect/0235.elec_armor/re-given/ +# +# Effectが上書きされた時の処理 +# +# @within function asset:effect/0235.elec_armor/_/re-given + +# フルセット効果を削除 + execute if data storage asset:context PreviousField{PrevStack:4} unless data storage asset:context {Stack:4} run function asset:effect/0235.elec_armor/fullset/dis_equip + +# フルセット効果を付与 + execute unless data storage asset:context PreviousField{PrevStack:4} if data storage asset:context {Stack:4} run function asset:effect/0235.elec_armor/fullset/equip + +# スタックを記録 + data modify storage asset:context this.PrevStack set from storage asset:context Stack diff --git a/Asset/data/asset/functions/effect/0235.elec_armor/register.mcfunction b/Asset/data/asset/functions/effect/0235.elec_armor/register.mcfunction new file mode 100644 index 0000000000..abb44ebf6d --- /dev/null +++ b/Asset/data/asset/functions/effect/0235.elec_armor/register.mcfunction @@ -0,0 +1,32 @@ +#> asset:effect/0235.elec_armor/register +# +# Effectのデータを指定 +# +# @within function asset:effect/0235.elec_armor/_/register + +# ExtendsSafe (boolean) (default = false) + # data modify storage asset:effect ExtendsSafe set value true +# ID (int) + data modify storage asset:effect ID set value 235 +# 名前 (TextComponentString) + data modify storage asset:effect Name set value '{"text":"エレキアーマー","color":"yellow"}' +# 説明文 (TextComponentString[]) + data modify storage asset:effect Description set value ['{"text":"雷攻撃 +3%","color":"green"}','{"text":"雷耐性 +3%","color":"green"}'] +# 効果時間 (int) (default = API || error) + data modify storage asset:effect Duration set value 2147384647 +# スタック (int) (default = API || 1) + # data modify storage asset:effect Stack set value +# 効果時間の操作方法 (default = API || "replace") + # data modify storage asset:effect DurationOperation set value +# スタックの操作方法 (default = API || "replace") + data modify storage asset:effect StackOperation set value "forceReplace" +# 最大効果時間 (int) (default = 2147483647) + # data modify storage asset:effect MaxDuration set value +# 最大スタック (int) (default = 2147483647) + data modify storage asset:effect MaxStack set value 4 +# 悪い効果か否か (boolean) + data modify storage asset:effect IsBadEffect set value false +# 死亡時のエフェクトの処理 (default = "remove") + # data modify storage asset:effect ProcessOnDied set value +# 消すのに必要なレベル (int) (default = 1) + data modify storage asset:effect RequireClearLv set value 4 diff --git a/Asset/data/asset/functions/effect/0235.elec_armor/remove/.mcfunction b/Asset/data/asset/functions/effect/0235.elec_armor/remove/.mcfunction new file mode 100644 index 0000000000..1c755234cf --- /dev/null +++ b/Asset/data/asset/functions/effect/0235.elec_armor/remove/.mcfunction @@ -0,0 +1,11 @@ +#> asset:effect/0235.elec_armor/remove/ +# +# Effectが削除された時の処理 +# +# @within function asset:effect/0235.elec_armor/_/remove + +# フルセット効果を削除 + execute if data storage asset:context {Stack:4} run function asset:effect/0235.elec_armor/fullset/dis_equip + +# スタックを記録 + data modify storage asset:context this.PrevStack set from storage asset:context Stack diff --git a/Asset/data/asset/functions/effect/0236.solitariness/_/register.mcfunction b/Asset/data/asset/functions/effect/0236.solitariness/_/register.mcfunction new file mode 100644 index 0000000000..d182feb00f --- /dev/null +++ b/Asset/data/asset/functions/effect/0236.solitariness/_/register.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0236.solitariness/_/register +# +# +# +# @within tag/function asset:effect/register + +execute if data storage asset:context {id:236} run function asset:effect/0236.solitariness/register \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0236.solitariness/register.mcfunction b/Asset/data/asset/functions/effect/0236.solitariness/register.mcfunction new file mode 100644 index 0000000000..a370aec9ae --- /dev/null +++ b/Asset/data/asset/functions/effect/0236.solitariness/register.mcfunction @@ -0,0 +1,32 @@ +#> asset:effect/0236.solitariness/register +# +# Effectのデータを指定 +# +# @within function asset:effect/0236.solitariness/_/register + +# ExtendsSafe (boolean) (default = false) + # data modify storage asset:effect ExtendsSafe set value true +# ID (int) + data modify storage asset:effect ID set value 236 +# 名前 (TextComponentString) + data modify storage asset:effect Name set value '[{"text":"۞","color":"dark_gray"},{"text":"ソリタリネス","color":"gray"},{"text":"۞","color":"dark_gray"}]' +# 説明文 (TextComponentString[]) + data modify storage asset:effect Description set value [] +# 効果時間 (int) (default = API || error) + data modify storage asset:effect Duration set value 2147483647 +# スタック (int) (default = API || 1) + # data modify storage asset:effect Stack set value +# 効果時間の操作方法 (default = API || "replace") + # data modify storage asset:effect DurationOperation set value +# スタックの操作方法 (default = API || "replace") + data modify storage asset:effect StackOperation set value "forceReplace" +# 最大効果時間 (int) (default = 2147483647) + # data modify storage asset:effect MaxDuration set value +# 最大スタック (int) (default = 2147483647) + data modify storage asset:effect MaxStack set value 4 +# 悪い効果か否か (boolean) + data modify storage asset:effect IsBadEffect set value false +# 死亡時のエフェクトの処理 (default = "remove") + # data modify storage asset:effect ProcessOnDied set value +# 消すのに必要なレベル (int) (default = 1) + data modify storage asset:effect RequireClearLv set value 4 diff --git a/Asset/data/asset/functions/effect/0237.heartland/_/register.mcfunction b/Asset/data/asset/functions/effect/0237.heartland/_/register.mcfunction new file mode 100644 index 0000000000..1554543efc --- /dev/null +++ b/Asset/data/asset/functions/effect/0237.heartland/_/register.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0237.heartland/_/register +# +# +# +# @within tag/function asset:effect/register + +execute if data storage asset:context {id:237} run function asset:effect/0237.heartland/register \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0237.heartland/_/tick.mcfunction b/Asset/data/asset/functions/effect/0237.heartland/_/tick.mcfunction new file mode 100644 index 0000000000..dca639c8e8 --- /dev/null +++ b/Asset/data/asset/functions/effect/0237.heartland/_/tick.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0237.heartland/_/tick +# +# Effectが発動している間毎tick実行されるfunction +# +# @within tag/function asset:effect/tick + +execute if data storage asset:context {id:237} run function asset:effect/0237.heartland/tick/ \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0237.heartland/fullset/passive.mcfunction b/Asset/data/asset/functions/effect/0237.heartland/fullset/passive.mcfunction new file mode 100644 index 0000000000..7fde069cb6 --- /dev/null +++ b/Asset/data/asset/functions/effect/0237.heartland/fullset/passive.mcfunction @@ -0,0 +1,5 @@ +#> asset:effect/0237.heartland/fullset/passive +# @within function asset:effect/0237.heartland/tick/ + +# 演出 + execute as @a if predicate asset:effect/0237.heartland/regene_check run effect give @s regeneration 15 1 false diff --git a/Asset/data/asset/functions/effect/0237.heartland/register.mcfunction b/Asset/data/asset/functions/effect/0237.heartland/register.mcfunction new file mode 100644 index 0000000000..993915afc8 --- /dev/null +++ b/Asset/data/asset/functions/effect/0237.heartland/register.mcfunction @@ -0,0 +1,32 @@ +#> asset:effect/0237.heartland/register +# +# Effectのデータを指定 +# +# @within function asset:effect/0237.heartland/_/register + +# ExtendsSafe (boolean) (default = false) + # data modify storage asset:effect ExtendsSafe set value true +# ID (int) + data modify storage asset:effect ID set value 237 +# 名前 (TextComponentString) + data modify storage asset:effect Name set value '[{"text":"ハート","color":"light_purple","bold":true},{"text":"ランド","color":"green","bold":true}]' +# 説明文 (TextComponentString[]) + data modify storage asset:effect Description set value ['{"text":"全身を大地の衣で覆ったとき、周囲に再生の力を与える。"}'] +# 効果時間 (int) (default = API || error) + data modify storage asset:effect Duration set value 2147483647 +# スタック (int) (default = API || 1) + # data modify storage asset:effect Stack set value +# 効果時間の操作方法 (default = API || "replace") + # data modify storage asset:effect DurationOperation set value +# スタックの操作方法 (default = API || "replace") + data modify storage asset:effect StackOperation set value "forceReplace" +# 最大効果時間 (int) (default = 2147483647) + # data modify storage asset:effect MaxDuration set value +# 最大スタック (int) (default = 2147483647) + data modify storage asset:effect MaxStack set value 4 +# 悪い効果か否か (boolean) + data modify storage asset:effect IsBadEffect set value false +# 死亡時のエフェクトの処理 (default = "remove") + # data modify storage asset:effect ProcessOnDied set value +# 消すのに必要なレベル (int) (default = 1) + data modify storage asset:effect RequireClearLv set value 4 diff --git a/Asset/data/asset/functions/effect/0237.heartland/tick/.mcfunction b/Asset/data/asset/functions/effect/0237.heartland/tick/.mcfunction new file mode 100644 index 0000000000..cf4a257c3f --- /dev/null +++ b/Asset/data/asset/functions/effect/0237.heartland/tick/.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0237.heartland/tick/ +# +# Effectのtick処理 +# +# @within function asset:effect/0237.heartland/_/tick + +execute if data storage asset:context {Stack:4} run function asset:effect/0237.heartland/fullset/passive diff --git a/Asset/data/asset/functions/effect/0238.raimei/_/given.mcfunction b/Asset/data/asset/functions/effect/0238.raimei/_/given.mcfunction new file mode 100644 index 0000000000..807ec5f833 --- /dev/null +++ b/Asset/data/asset/functions/effect/0238.raimei/_/given.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0238.raimei/_/given +# +# Effectが付与された時に実行されるfunction +# +# @within tag/function asset:effect/given + +execute if data storage asset:context {id:238} run function asset:effect/0238.raimei/given/ \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0238.raimei/_/re-given.mcfunction b/Asset/data/asset/functions/effect/0238.raimei/_/re-given.mcfunction new file mode 100644 index 0000000000..ad15ba4416 --- /dev/null +++ b/Asset/data/asset/functions/effect/0238.raimei/_/re-given.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0238.raimei/_/re-given +# +# Effectが上書きされた時に実行されるfunction +# +# @within tag/function asset:effect/re-given + +execute if data storage asset:context {id:238} run function asset:effect/0238.raimei/re-given/ diff --git a/Asset/data/asset/functions/effect/0238.raimei/_/register.mcfunction b/Asset/data/asset/functions/effect/0238.raimei/_/register.mcfunction new file mode 100644 index 0000000000..ab1ca67ca5 --- /dev/null +++ b/Asset/data/asset/functions/effect/0238.raimei/_/register.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0238.raimei/_/register +# +# +# +# @within tag/function asset:effect/register + +execute if data storage asset:context {id:238} run function asset:effect/0238.raimei/register \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0238.raimei/_/remove.mcfunction b/Asset/data/asset/functions/effect/0238.raimei/_/remove.mcfunction new file mode 100644 index 0000000000..14cf6b13ee --- /dev/null +++ b/Asset/data/asset/functions/effect/0238.raimei/_/remove.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0238.raimei/_/remove +# +# Effectが神器や牛乳によって削除された時に実行されるfunction +# +# @within tag/function asset:effect/remove + +execute if data storage asset:context {id:238} run function asset:effect/0238.raimei/remove/ \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0238.raimei/_/tick.mcfunction b/Asset/data/asset/functions/effect/0238.raimei/_/tick.mcfunction new file mode 100644 index 0000000000..d0188b359b --- /dev/null +++ b/Asset/data/asset/functions/effect/0238.raimei/_/tick.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0238.raimei/_/tick +# +# Effectが発動している間毎tick実行されるfunction +# +# @within tag/function asset:effect/tick + +execute if data storage asset:context {id:238} run function asset:effect/0238.raimei/tick/ \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0238.raimei/fullset/dis_equip.mcfunction b/Asset/data/asset/functions/effect/0238.raimei/fullset/dis_equip.mcfunction new file mode 100644 index 0000000000..6409c6753b --- /dev/null +++ b/Asset/data/asset/functions/effect/0238.raimei/fullset/dis_equip.mcfunction @@ -0,0 +1,8 @@ +#> asset:effect/0238.raimei/fullset/dis_equip +# @within function +# asset:effect/0238.raimei/re-given/ +# asset:effect/0238.raimei/remove/ + +# 雷耐性+9% + data modify storage api: Argument.UUID set value [I;1,3,238,0] + function api:modifier/defense/thunder/remove diff --git a/Asset/data/asset/functions/effect/0238.raimei/fullset/equip.mcfunction b/Asset/data/asset/functions/effect/0238.raimei/fullset/equip.mcfunction new file mode 100644 index 0000000000..05a7f5a981 --- /dev/null +++ b/Asset/data/asset/functions/effect/0238.raimei/fullset/equip.mcfunction @@ -0,0 +1,18 @@ +#> asset:effect/0238.raimei/fullset/equip +# @within function asset:effect/0238.raimei/*given/ + +# 雷耐性+9% + data modify storage api: Argument.UUID set value [I;1,3,238,0] + data modify storage api: Argument.Amount set value 0.09 + data modify storage api: Argument.Operation set value "multiply_base" + function api:modifier/defense/thunder/add + +# 演出 + particle dust 1 1 0 1 ~ ~3 ~ 0.7 3 0.7 0 300 + particle dust 1 1 0 1 ~ ~5 ~ 0.1 5 0.1 0 300 + particle minecraft:explosion ~ ~ ~ 0.3 0 0.3 0 10 + particle minecraft:large_smoke ~ ~ ~ 0 0 0 0.4 100 + playsound entity.lightning_bolt.thunder player @a ~ ~ ~ 1 2 + playsound entity.lightning_bolt.thunder player @a ~ ~ ~ 1 2 + playsound entity.lightning_bolt.impact player @a ~ ~ ~ 1 0 + playsound block.end_portal.spawn player @a ~ ~ ~ 1 1 diff --git a/Asset/data/asset/functions/effect/0238.raimei/fullset/passive.mcfunction b/Asset/data/asset/functions/effect/0238.raimei/fullset/passive.mcfunction new file mode 100644 index 0000000000..6b0a03d168 --- /dev/null +++ b/Asset/data/asset/functions/effect/0238.raimei/fullset/passive.mcfunction @@ -0,0 +1,10 @@ +#> asset:effect/0238.raimei/fullset/passive +# @within function asset:effect/0238.raimei/tick/ + +# 演出 + particle dust 1 1 0 1 ~ ~1 ~ 0.3 0.3 0.3 0 1 normal + +# 効果 + effect give @s jump_boost 1 1 true + effect give @s speed 1 1 true + effect give @s haste 1 0 true diff --git a/Asset/data/asset/functions/effect/0238.raimei/given/.mcfunction b/Asset/data/asset/functions/effect/0238.raimei/given/.mcfunction new file mode 100644 index 0000000000..f4ece480a1 --- /dev/null +++ b/Asset/data/asset/functions/effect/0238.raimei/given/.mcfunction @@ -0,0 +1,11 @@ +#> asset:effect/0238.raimei/given/ +# +# Effectが付与された時の処理 +# +# @within function asset:effect/0238.raimei/_/given + +# フルセット効果を付与 + execute if data storage asset:context {Stack:4} run function asset:effect/0238.raimei/fullset/equip + +# スタックを記録 + data modify storage asset:context this.PrevStack set from storage asset:context Stack diff --git a/Asset/data/asset/functions/effect/0238.raimei/re-given/.mcfunction b/Asset/data/asset/functions/effect/0238.raimei/re-given/.mcfunction new file mode 100644 index 0000000000..a696bebf58 --- /dev/null +++ b/Asset/data/asset/functions/effect/0238.raimei/re-given/.mcfunction @@ -0,0 +1,14 @@ +#> asset:effect/0238.raimei/re-given/ +# +# Effectが上書きされた時の処理 +# +# @within function asset:effect/0238.raimei/_/re-given + +# フルセット効果を削除 + execute if data storage asset:context PreviousField{PrevStack:4} unless data storage asset:context {Stack:4} run function asset:effect/0238.raimei/fullset/dis_equip + +# フルセット効果を付与 + execute unless data storage asset:context PreviousField{PrevStack:4} if data storage asset:context {Stack:4} run function asset:effect/0238.raimei/fullset/equip + +# スタックを記録 + data modify storage asset:context this.PrevStack set from storage asset:context Stack diff --git a/Asset/data/asset/functions/effect/0238.raimei/register.mcfunction b/Asset/data/asset/functions/effect/0238.raimei/register.mcfunction new file mode 100644 index 0000000000..b15f6d48df --- /dev/null +++ b/Asset/data/asset/functions/effect/0238.raimei/register.mcfunction @@ -0,0 +1,32 @@ +#> asset:effect/0238.raimei/register +# +# Effectのデータを指定 +# +# @within function asset:effect/0238.raimei/_/register + +# ExtendsSafe (boolean) (default = false) + # data modify storage asset:effect ExtendsSafe set value true +# ID (int) + data modify storage asset:effect ID set value 238 +# 名前 (TextComponentString) + data modify storage asset:effect Name set value '{"text":"雷鳴","color":"yellow"}' +# 説明文 (TextComponentString[]) + data modify storage asset:effect Description set value ['{"text":"全ての部位を装備すると機敏になり、"}','{"text":"近接攻撃に対して追撃が発生する。"}','{"text":"雷耐性 +9%","color":"green"}'] +# 効果時間 (int) (default = API || error) + data modify storage asset:effect Duration set value 2147483647 +# スタック (int) (default = API || 1) + # data modify storage asset:effect Stack set value +# 効果時間の操作方法 (default = API || "replace") + # data modify storage asset:effect DurationOperation set value +# スタックの操作方法 (default = API || "replace") + data modify storage asset:effect StackOperation set value "forceReplace" +# 最大効果時間 (int) (default = 2147483647) + # data modify storage asset:effect MaxDuration set value +# 最大スタック (int) (default = 2147483647) + data modify storage asset:effect MaxStack set value 4 +# 悪い効果か否か (boolean) + data modify storage asset:effect IsBadEffect set value false +# 死亡時のエフェクトの処理 (default = "remove") + # data modify storage asset:effect ProcessOnDied set value +# 消すのに必要なレベル (int) (default = 1) + data modify storage asset:effect RequireClearLv set value 4 diff --git a/Asset/data/asset/functions/effect/0238.raimei/remove/.mcfunction b/Asset/data/asset/functions/effect/0238.raimei/remove/.mcfunction new file mode 100644 index 0000000000..bb666ec757 --- /dev/null +++ b/Asset/data/asset/functions/effect/0238.raimei/remove/.mcfunction @@ -0,0 +1,11 @@ +#> asset:effect/0238.raimei/remove/ +# +# Effectが削除された時の処理 +# +# @within function asset:effect/0238.raimei/_/remove + +# フルセット効果を削除 + execute if data storage asset:context {Stack:4} run function asset:effect/0238.raimei/fullset/dis_equip + +# スタックを記録 + data modify storage asset:context this.PrevStack set from storage asset:context Stack diff --git a/Asset/data/asset/functions/effect/0238.raimei/tick/.mcfunction b/Asset/data/asset/functions/effect/0238.raimei/tick/.mcfunction new file mode 100644 index 0000000000..714508e568 --- /dev/null +++ b/Asset/data/asset/functions/effect/0238.raimei/tick/.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0238.raimei/tick/ +# +# Effectのtick処理 +# +# @within function asset:effect/0238.raimei/_/tick + +execute if data storage asset:context {Stack:4} run function asset:effect/0238.raimei/fullset/passive diff --git a/Asset/data/asset/functions/effect/0239.thorn_armor/_/given.mcfunction b/Asset/data/asset/functions/effect/0239.thorn_armor/_/given.mcfunction new file mode 100644 index 0000000000..4edf73adab --- /dev/null +++ b/Asset/data/asset/functions/effect/0239.thorn_armor/_/given.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0239.thorn_armor/_/given +# +# Effectが付与された時に実行されるfunction +# +# @within tag/function asset:effect/given + +execute if data storage asset:context {id:239} run function asset:effect/0239.thorn_armor/given/ \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0239.thorn_armor/_/re-given.mcfunction b/Asset/data/asset/functions/effect/0239.thorn_armor/_/re-given.mcfunction new file mode 100644 index 0000000000..dbf21e362d --- /dev/null +++ b/Asset/data/asset/functions/effect/0239.thorn_armor/_/re-given.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0239.thorn_armor/_/re-given +# +# Effectが上書きされた時に実行されるfunction +# +# @within tag/function asset:effect/re-given + +execute if data storage asset:context {id:239} run function asset:effect/0239.thorn_armor/re-given/ \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0239.thorn_armor/_/register.mcfunction b/Asset/data/asset/functions/effect/0239.thorn_armor/_/register.mcfunction new file mode 100644 index 0000000000..cca23d1fa0 --- /dev/null +++ b/Asset/data/asset/functions/effect/0239.thorn_armor/_/register.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0239.thorn_armor/_/register +# +# +# +# @within tag/function asset:effect/register + +execute if data storage asset:context {id:239} run function asset:effect/0239.thorn_armor/register \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0239.thorn_armor/_/tick.mcfunction b/Asset/data/asset/functions/effect/0239.thorn_armor/_/tick.mcfunction new file mode 100644 index 0000000000..c513ea542e --- /dev/null +++ b/Asset/data/asset/functions/effect/0239.thorn_armor/_/tick.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0239.thorn_armor/_/tick +# +# Effectが発動している間毎tick実行されるfunction +# +# @within tag/function asset:effect/tick + +execute if data storage asset:context {id:239} run function asset:effect/0239.thorn_armor/tick/ \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0239.thorn_armor/fullset/equip.mcfunction b/Asset/data/asset/functions/effect/0239.thorn_armor/fullset/equip.mcfunction new file mode 100644 index 0000000000..d7bfef0f0b --- /dev/null +++ b/Asset/data/asset/functions/effect/0239.thorn_armor/fullset/equip.mcfunction @@ -0,0 +1,8 @@ +#> asset:effect/0239.thorn_armor/fullset/equip +# @within function asset:effect/0239.thorn_armor/*given/ + +# 演出 + particle dust 0 0.2 0 1.5 ~ ~0.05 ~ 3 0 3 0 250 normal @a + particle dust 0 0.2 0 1 ~ ~1.2 ~ 0.4 0.4 0.4 0 20 normal @a + particle dust 0 0.2 0 1 ~ ~1.2 ~ 0.4 0.5 0.6 0 80 normal @a + playsound block.sweet_berry_bush.place player @a ~ ~ ~ 1 0 0 diff --git a/Asset/data/asset/functions/effect/0239.thorn_armor/fullset/passive.mcfunction b/Asset/data/asset/functions/effect/0239.thorn_armor/fullset/passive.mcfunction new file mode 100644 index 0000000000..a9652cc0d7 --- /dev/null +++ b/Asset/data/asset/functions/effect/0239.thorn_armor/fullset/passive.mcfunction @@ -0,0 +1,5 @@ +#> asset:effect/0239.thorn_armor/fullset/passive +# @within function asset:effect/0239.thorn_armor/tick/ + +# 演出 + particle dust 0 0.2 0 1 ~ ~1.3 ~ 0.8 0.4 0.8 0 2 normal @a diff --git a/Asset/data/asset/functions/effect/0239.thorn_armor/given/.mcfunction b/Asset/data/asset/functions/effect/0239.thorn_armor/given/.mcfunction new file mode 100644 index 0000000000..9c88631a36 --- /dev/null +++ b/Asset/data/asset/functions/effect/0239.thorn_armor/given/.mcfunction @@ -0,0 +1,11 @@ +#> asset:effect/0239.thorn_armor/given/ +# +# Effectが付与された時の処理 +# +# @within function asset:effect/0239.thorn_armor/_/given + +# フルセット効果を付与 + execute if data storage asset:context {Stack:4} run function asset:effect/0239.thorn_armor/fullset/equip + +# スタックを記録 + data modify storage asset:context this.PrevStack set from storage asset:context Stack diff --git a/Asset/data/asset/functions/effect/0239.thorn_armor/re-given/.mcfunction b/Asset/data/asset/functions/effect/0239.thorn_armor/re-given/.mcfunction new file mode 100644 index 0000000000..36cfde277e --- /dev/null +++ b/Asset/data/asset/functions/effect/0239.thorn_armor/re-given/.mcfunction @@ -0,0 +1,11 @@ +#> asset:effect/0239.thorn_armor/re-given/ +# +# Effectが上書きされた時の処理 +# +# @within function asset:effect/0239.thorn_armor/_/re-given + +# フルセット効果を付与 + execute unless data storage asset:context PreviousField{PrevStack:4} if data storage asset:context {Stack:4} run function asset:effect/0239.thorn_armor/fullset/equip + +# スタックを記録 + data modify storage asset:context this.PrevStack set from storage asset:context Stack diff --git a/Asset/data/asset/functions/effect/0239.thorn_armor/register.mcfunction b/Asset/data/asset/functions/effect/0239.thorn_armor/register.mcfunction new file mode 100644 index 0000000000..3a339bee35 --- /dev/null +++ b/Asset/data/asset/functions/effect/0239.thorn_armor/register.mcfunction @@ -0,0 +1,32 @@ +#> asset:effect/0239.thorn_armor/register +# +# Effectのデータを指定 +# +# @within function asset:effect/0239.thorn_armor/_/register + +# ExtendsSafe (boolean) (default = false) + # data modify storage asset:effect ExtendsSafe set value true +# ID (int) + data modify storage asset:effect ID set value 239 +# 名前 (TextComponentString) + data modify storage asset:effect Name set value '{"text":"ソーンアーマー","color":"#1D5923"}' +# 説明文 (TextComponentString[]) + data modify storage asset:effect Description set value ['[{"text":"全て纒いし時、血吸いの荊が目を覚まし、","color":"#457341"}]','[{"text":"触れた者を突き刺し回復する。","color":"#457341"}]'] +# 効果時間 (int) (default = API || error) + data modify storage asset:effect Duration set value 2147483647 +# スタック (int) (default = API || 1) + # data modify storage asset:effect Stack set value +# 効果時間の操作方法 (default = API || "replace") + # data modify storage asset:effect DurationOperation set value +# スタックの操作方法 (default = API || "replace") + data modify storage asset:effect StackOperation set value "forceReplace" +# 最大効果時間 (int) (default = 2147483647) + # data modify storage asset:effect MaxDuration set value +# 最大スタック (int) (default = 2147483647) + data modify storage asset:effect MaxStack set value 4 +# 悪い効果か否か (boolean) + data modify storage asset:effect IsBadEffect set value false +# 死亡時のエフェクトの処理 (default = "remove") + # data modify storage asset:effect ProcessOnDied set value +# 消すのに必要なレベル (int) (default = 1) + data modify storage asset:effect RequireClearLv set value 4 diff --git a/Asset/data/asset/functions/effect/0239.thorn_armor/tick/.mcfunction b/Asset/data/asset/functions/effect/0239.thorn_armor/tick/.mcfunction new file mode 100644 index 0000000000..0cc85121a0 --- /dev/null +++ b/Asset/data/asset/functions/effect/0239.thorn_armor/tick/.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0239.thorn_armor/tick/ +# +# Effectのtick処理 +# +# @within function asset:effect/0239.thorn_armor/_/tick + +execute if data storage asset:context {Stack:4} run function asset:effect/0239.thorn_armor/fullset/passive diff --git a/Asset/data/asset/functions/effect/0240.bless_of_deep_sea_coral/_/given.mcfunction b/Asset/data/asset/functions/effect/0240.bless_of_deep_sea_coral/_/given.mcfunction new file mode 100644 index 0000000000..712a278a84 --- /dev/null +++ b/Asset/data/asset/functions/effect/0240.bless_of_deep_sea_coral/_/given.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0240.bless_of_deep_sea_coral/_/given +# +# Effectが付与された時に実行されるfunction +# +# @within tag/function asset:effect/given + +execute if data storage asset:context {id:240} run function asset:effect/0240.bless_of_deep_sea_coral/given/ diff --git a/Asset/data/asset/functions/effect/0240.bless_of_deep_sea_coral/_/re-given.mcfunction b/Asset/data/asset/functions/effect/0240.bless_of_deep_sea_coral/_/re-given.mcfunction new file mode 100644 index 0000000000..0a90592ac4 --- /dev/null +++ b/Asset/data/asset/functions/effect/0240.bless_of_deep_sea_coral/_/re-given.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0240.bless_of_deep_sea_coral/_/re-given +# +# Effectが上書きされた時に実行されるfunction +# +# @within tag/function asset:effect/re-given + +execute if data storage asset:context {id:240} run function asset:effect/0240.bless_of_deep_sea_coral/re-given/ diff --git a/Asset/data/asset/functions/effect/0240.bless_of_deep_sea_coral/_/register.mcfunction b/Asset/data/asset/functions/effect/0240.bless_of_deep_sea_coral/_/register.mcfunction new file mode 100644 index 0000000000..4915923b00 --- /dev/null +++ b/Asset/data/asset/functions/effect/0240.bless_of_deep_sea_coral/_/register.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0240.bless_of_deep_sea_coral/_/register +# +# +# +# @within tag/function asset:effect/register + +execute if data storage asset:context {id:240} run function asset:effect/0240.bless_of_deep_sea_coral/register diff --git a/Asset/data/asset/functions/effect/0240.bless_of_deep_sea_coral/_/remove.mcfunction b/Asset/data/asset/functions/effect/0240.bless_of_deep_sea_coral/_/remove.mcfunction new file mode 100644 index 0000000000..ea96f2356b --- /dev/null +++ b/Asset/data/asset/functions/effect/0240.bless_of_deep_sea_coral/_/remove.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0240.bless_of_deep_sea_coral/_/remove +# +# Effectが神器や牛乳によって削除された時に実行されるfunction +# +# @within tag/function asset:effect/remove + +execute if data storage asset:context {id:240} run function asset:effect/0240.bless_of_deep_sea_coral/remove/ diff --git a/Asset/data/asset/functions/effect/0240.bless_of_deep_sea_coral/_/tick.mcfunction b/Asset/data/asset/functions/effect/0240.bless_of_deep_sea_coral/_/tick.mcfunction new file mode 100644 index 0000000000..78367e3c47 --- /dev/null +++ b/Asset/data/asset/functions/effect/0240.bless_of_deep_sea_coral/_/tick.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0240.bless_of_deep_sea_coral/_/tick +# +# Effectが発動している間毎tick実行されるfunction +# +# @within tag/function asset:effect/tick + +execute if data storage asset:context {id:240} run function asset:effect/0240.bless_of_deep_sea_coral/tick/ diff --git a/Asset/data/asset/functions/effect/0240.bless_of_deep_sea_coral/fullset/dis_equip.mcfunction b/Asset/data/asset/functions/effect/0240.bless_of_deep_sea_coral/fullset/dis_equip.mcfunction new file mode 100644 index 0000000000..044b4fd969 --- /dev/null +++ b/Asset/data/asset/functions/effect/0240.bless_of_deep_sea_coral/fullset/dis_equip.mcfunction @@ -0,0 +1,8 @@ +#> asset:effect/0240.bless_of_deep_sea_coral/fullset/dis_equip +# @within function +# asset:effect/0240.bless_of_deep_sea_coral/re-given/ +# asset:effect/0240.bless_of_deep_sea_coral/remove/ + +# 水攻撃+5% + data modify storage api: Argument.UUID set value [I;1,3,240,0] + function api:modifier/attack/water/remove diff --git a/Asset/data/asset/functions/effect/0240.bless_of_deep_sea_coral/fullset/effect.mcfunction b/Asset/data/asset/functions/effect/0240.bless_of_deep_sea_coral/fullset/effect.mcfunction new file mode 100644 index 0000000000..7661130a6a --- /dev/null +++ b/Asset/data/asset/functions/effect/0240.bless_of_deep_sea_coral/fullset/effect.mcfunction @@ -0,0 +1,8 @@ +#> asset:effect/0240.bless_of_deep_sea_coral/fullset/effect +# @within function asset:effect/0240.bless_of_deep_sea_coral/fullset/passive + +# バフの塊 + effect give @s conduit_power 1 0 true + effect give @s dolphins_grace 1 0 true + effect give @s speed 1 0 true + effect give @s night_vision 11 0 true diff --git a/Asset/data/asset/functions/effect/0240.bless_of_deep_sea_coral/fullset/equip.mcfunction b/Asset/data/asset/functions/effect/0240.bless_of_deep_sea_coral/fullset/equip.mcfunction new file mode 100644 index 0000000000..7e8b9b0c19 --- /dev/null +++ b/Asset/data/asset/functions/effect/0240.bless_of_deep_sea_coral/fullset/equip.mcfunction @@ -0,0 +1,26 @@ +#> asset:effect/0240.bless_of_deep_sea_coral/fullset/equip +# @within function asset:effect/0240.bless_of_deep_sea_coral/*given/ + +# 演出 濃くするために重ねる + summon minecraft:area_effect_cloud ~ ~0.3 ~ {Age:0,Duration:8,WaitTime:0,Radius:3f,Tags:["Object","Uninterferable"],Particle:"dust 1 1 1000000000 1"} + summon minecraft:area_effect_cloud ~ ~0.3 ~ {Age:0,Duration:8,WaitTime:0,Radius:3f,Tags:["Object","Uninterferable"],Particle:"dust 1 1 1000000000 1"} + summon minecraft:area_effect_cloud ~ ~0.3 ~ {Age:0,Duration:8,WaitTime:0,Radius:3f,Tags:["Object","Uninterferable"],Particle:"dust 1 1 1000000000 1"} + + playsound ogg:block.amethyst_cluster.break2 player @a ~ ~ ~ 0.5 2 + playsound ogg:block.amethyst_cluster.break2 player @a ~ ~ ~ 0.5 1.75 + playsound ogg:block.amethyst_cluster.break2 player @a ~ ~ ~ 0.5 1.25 + playsound ogg:block.amethyst_cluster.break2 player @a ~ ~ ~ 0.5 1 + playsound block.end_portal.spawn player @a ~ ~ ~ 0.2 1.5 + playsound ogg:ambient.nether.crimson_forest.shine3 player @a ~ ~ ~ 0.35 2 + +# 珊瑚の演出 + execute rotated ~ 0 positioned ^-1.5 ^0.4 ^1.5 rotated ~45 -60 run function asset:effect/0240.bless_of_deep_sea_coral/fullset/vfx/1 + execute rotated ~ 0 positioned ^-1.5 ^0.4 ^-1.5 rotated ~135 -60 run function asset:effect/0240.bless_of_deep_sea_coral/fullset/vfx/2 + execute rotated ~ 0 positioned ^1.5 ^0.4 ^-1.5 rotated ~225 -60 run function asset:effect/0240.bless_of_deep_sea_coral/fullset/vfx/3 + execute rotated ~ 0 positioned ^1.5 ^0.4 ^1.5 rotated ~315 -60 run function asset:effect/0240.bless_of_deep_sea_coral/fullset/vfx/4 + +# 水攻撃+5% + data modify storage api: Argument.UUID set value [I;1,3,240,0] + data modify storage api: Argument.Amount set value 0.05 + data modify storage api: Argument.Operation set value "multiply_base" + function api:modifier/attack/water/add diff --git a/Asset/data/asset/functions/effect/0240.bless_of_deep_sea_coral/fullset/passive.mcfunction b/Asset/data/asset/functions/effect/0240.bless_of_deep_sea_coral/fullset/passive.mcfunction new file mode 100644 index 0000000000..ed804bf8f0 --- /dev/null +++ b/Asset/data/asset/functions/effect/0240.bless_of_deep_sea_coral/fullset/passive.mcfunction @@ -0,0 +1,9 @@ +#> asset:effect/0240.bless_of_deep_sea_coral/fullset/passive +# @within function asset:effect/0240.bless_of_deep_sea_coral/tick/ + +# バフ + execute unless entity @s[predicate=!lib:weather/is_raining,predicate=!lib:weather/is_thundering,predicate=!lib:is_in_water/include_flowing] run function asset:effect/0240.bless_of_deep_sea_coral/fullset/effect + +# 演出 + particle dust 1 1 1000000000 0.5 ~ ~1.4 ~ 1 0.5 1 0 3 normal @a + particle dolphin ~ ~1.4 ~ 1.2 0.5 1.2 0 1 normal @a diff --git a/Asset/data/asset/functions/effect/0240.bless_of_deep_sea_coral/fullset/vfx/1.mcfunction b/Asset/data/asset/functions/effect/0240.bless_of_deep_sea_coral/fullset/vfx/1.mcfunction new file mode 100644 index 0000000000..a4f9f32874 --- /dev/null +++ b/Asset/data/asset/functions/effect/0240.bless_of_deep_sea_coral/fullset/vfx/1.mcfunction @@ -0,0 +1,40 @@ +#> asset:effect/0240.bless_of_deep_sea_coral/fullset/vfx/1 +# +# +# +# @within function asset:effect/0240.bless_of_deep_sea_coral/fullset/equip + +# [ImportKey]: NobwRALgngDgpmAXGANgSwHYIDRgK55oAmSYRATAGYDsAxtQEaUC01ArAJxvMAsbAzB2YBDOByLMADD3Jx+ARmHkAbG2XkwuDMIC2CZIC3fAATzNYGMIBOugM5JwtAPZ4MEJPMm5KlxzvtgAN2EUPH1wAA8kTzAoKIBfONwIR38gkLCwSMRo2MR5BNxHSkobODds3AY4AC80OEso3DQbACEaussAUQBHPGCUKABlC1o4EkRKYNKC8Gh4UnQsMwJiUkl+MeU5amZaWgYeXh5qZWYADmp+M6kOcgYOYTYz2mVqHDBtPVJjDVwLax0dkQDmcrnc0W8vlSwVC-iyOXcBUgKWBgRhGXhADplLhcuRMWwkUUSmVGmAqrV6mTmm1KV1ev0hiMxkhJihpolZrB9KhMO8VuNyfxyDweJQiHBmA9yDseMp+BJhLQzpKeLceMqzsoePx5WZPjyfrtHDBYn8rLZ-E4XOUPF4fH5UWlYaj4bjEYlkdD0nCkFJse7EPjCZ7iaVytEKR1qa12vUen0UANhkqWRMpnAEgBdIA_3 +# 線 1 +particle dust 0.439 0.737 1 2 ^0 ^ ^0 0 0 0 0 1 +particle dust 0.439 0.737 1 2 ^0 ^ ^0.11111 0 0 0 0 1 +particle dust 0.439 0.737 1 2 ^0 ^ ^0.22222 0 0 0 0 1 +particle dust 0.439 0.737 1 2 ^0 ^ ^0.33333 0 0 0 0 1 +particle dust 0.439 0.737 1 2 ^0 ^ ^0.44444 0 0 0 0 1 +particle dust 0.439 0.737 1 2 ^0 ^ ^0.55556 0 0 0 0 1 +particle dust 0.439 0.737 1 2 ^0 ^ ^0.66667 0 0 0 0 1 +particle dust 0.439 0.737 1 2 ^0 ^ ^0.77778 0 0 0 0 1 +particle dust 0.439 0.737 1 2 ^0 ^ ^0.88889 0 0 0 0 1 +particle dust 0.439 0.737 1 2 ^0 ^ ^1 0 0 0 0 1 +# 線 2 +particle dust 0.439 0.737 1 2 ^0 ^ ^1 0 0 0 0 1 +particle dust 0.439 0.737 1 2 ^0.06667 ^ ^1.16667 0 0 0 0 1 +particle dust 0.439 0.737 1 2 ^0.13333 ^ ^1.33333 0 0 0 0 1 +particle dust 0.439 0.737 1 2 ^0.2 ^ ^1.5 0 0 0 0 1 +particle dust 0.439 0.737 1 2 ^0.26667 ^ ^1.66667 0 0 0 0 1 +particle dust 0.439 0.737 1 2 ^0.33333 ^ ^1.83333 0 0 0 0 1 +particle dust 0.439 0.737 1 2 ^0.4 ^ ^2 0 0 0 0 1 +particle dust 0.439 0.737 1 2 ^0.46667 ^ ^2.16667 0 0 0 0 1 +particle dust 0.439 0.737 1 2 ^0.53333 ^ ^2.33333 0 0 0 0 1 +particle dust 0.439 0.737 1 2 ^0.6 ^ ^2.5 0 0 0 0 1 +# 線 2-copy +particle dust 0.439 0.737 1 2 ^0 ^ ^1 0 0 0 0 1 +particle dust 0.439 0.737 1 2 ^-0.06667 ^ ^1.16667 0 0 0 0 1 +particle dust 0.439 0.737 1 2 ^-0.13333 ^ ^1.33333 0 0 0 0 1 +particle dust 0.439 0.737 1 2 ^-0.2 ^ ^1.5 0 0 0 0 1 +particle dust 0.439 0.737 1 2 ^-0.26667 ^ ^1.66667 0 0 0 0 1 +particle dust 0.439 0.737 1 2 ^-0.33333 ^ ^1.83333 0 0 0 0 1 +particle dust 0.439 0.737 1 2 ^-0.4 ^ ^2 0 0 0 0 1 +particle dust 0.439 0.737 1 2 ^-0.46667 ^ ^2.16667 0 0 0 0 1 +particle dust 0.439 0.737 1 2 ^-0.53333 ^ ^2.33333 0 0 0 0 1 +particle dust 0.439 0.737 1 2 ^-0.6 ^ ^2.5 0 0 0 0 1 diff --git a/Asset/data/asset/functions/effect/0240.bless_of_deep_sea_coral/fullset/vfx/2.mcfunction b/Asset/data/asset/functions/effect/0240.bless_of_deep_sea_coral/fullset/vfx/2.mcfunction new file mode 100644 index 0000000000..ff215c1b4e --- /dev/null +++ b/Asset/data/asset/functions/effect/0240.bless_of_deep_sea_coral/fullset/vfx/2.mcfunction @@ -0,0 +1,40 @@ +#> asset:effect/0240.bless_of_deep_sea_coral/fullset/vfx/2 +# +# +# +# @within function asset:effect/0240.bless_of_deep_sea_coral/fullset/equip + +# [ImportKey]: NobwRALgngDgpmAXGANgSwHYIDRgK55oAmSYRATAGYDsAxtQEaUC01ArAJxvMAsbAzB2YBDOByLMADD3Jx+ARmHkAbG2XkwuDMIC2CZIC3fAATzNYGMIBOugM5JwtAPZ4MEJPMm5KlxzvtgAN2EUPH1wAA8kTzAoKIBfONwIR38gkLCwSMRo2MR5BNxHSkobODds3AY4AC80OEso3DQbACEaussAUQBHPGCUKABlC1o4EkRKYNKC8Gh4UnQsMwJiUkl+MeU5amZaWgYeXh5qZWYADmp+M6kOcgYOYTYz2mVqHDBtPVJjDVwLax0dkQDmcrnc0W8vlSwVC-iyOXcBUgKWBgRhGXhADplLhcuRMWwkUUSmVGmAqrV6mTmm1KV1ev0hiMxkhJihpolZrB9KhMO8VuNyfxyDweJQiHBmA9yDseMp+BJhLQzpKeLceMqzsoePx5WZPjyfrtHDBYn8rLZ-E4XOUPF4fH5UWlYaj4bjEYlkdD0nCkFJse7EPjCZ7iaVytEKR1qa12vUen0UANhkqWRMpnAEgBdIA_3 +# 線 1 +particle dust 0.494 0.545 1 2 ^0 ^ ^0 0 0 0 0 1 +particle dust 0.494 0.545 1 2 ^0 ^ ^0.11111 0 0 0 0 1 +particle dust 0.494 0.545 1 2 ^0 ^ ^0.22222 0 0 0 0 1 +particle dust 0.494 0.545 1 2 ^0 ^ ^0.33333 0 0 0 0 1 +particle dust 0.494 0.545 1 2 ^0 ^ ^0.44444 0 0 0 0 1 +particle dust 0.494 0.545 1 2 ^0 ^ ^0.55556 0 0 0 0 1 +particle dust 0.494 0.545 1 2 ^0 ^ ^0.66667 0 0 0 0 1 +particle dust 0.494 0.545 1 2 ^0 ^ ^0.77778 0 0 0 0 1 +particle dust 0.494 0.545 1 2 ^0 ^ ^0.88889 0 0 0 0 1 +particle dust 0.494 0.545 1 2 ^0 ^ ^1 0 0 0 0 1 +# 線 2 +particle dust 0.494 0.545 1 2 ^0 ^ ^1 0 0 0 0 1 +particle dust 0.494 0.545 1 2 ^0.06667 ^ ^1.16667 0 0 0 0 1 +particle dust 0.494 0.545 1 2 ^0.13333 ^ ^1.33333 0 0 0 0 1 +particle dust 0.494 0.545 1 2 ^0.2 ^ ^1.5 0 0 0 0 1 +particle dust 0.494 0.545 1 2 ^0.26667 ^ ^1.66667 0 0 0 0 1 +particle dust 0.494 0.545 1 2 ^0.33333 ^ ^1.83333 0 0 0 0 1 +particle dust 0.494 0.545 1 2 ^0.4 ^ ^2 0 0 0 0 1 +particle dust 0.494 0.545 1 2 ^0.46667 ^ ^2.16667 0 0 0 0 1 +particle dust 0.494 0.545 1 2 ^0.53333 ^ ^2.33333 0 0 0 0 1 +particle dust 0.494 0.545 1 2 ^0.6 ^ ^2.5 0 0 0 0 1 +# 線 2-copy +particle dust 0.494 0.545 1 2 ^0 ^ ^1 0 0 0 0 1 +particle dust 0.494 0.545 1 2 ^-0.06667 ^ ^1.16667 0 0 0 0 1 +particle dust 0.494 0.545 1 2 ^-0.13333 ^ ^1.33333 0 0 0 0 1 +particle dust 0.494 0.545 1 2 ^-0.2 ^ ^1.5 0 0 0 0 1 +particle dust 0.494 0.545 1 2 ^-0.26667 ^ ^1.66667 0 0 0 0 1 +particle dust 0.494 0.545 1 2 ^-0.33333 ^ ^1.83333 0 0 0 0 1 +particle dust 0.494 0.545 1 2 ^-0.4 ^ ^2 0 0 0 0 1 +particle dust 0.494 0.545 1 2 ^-0.46667 ^ ^2.16667 0 0 0 0 1 +particle dust 0.494 0.545 1 2 ^-0.53333 ^ ^2.33333 0 0 0 0 1 +particle dust 0.494 0.545 1 2 ^-0.6 ^ ^2.5 0 0 0 0 1 diff --git a/Asset/data/asset/functions/effect/0240.bless_of_deep_sea_coral/fullset/vfx/3.mcfunction b/Asset/data/asset/functions/effect/0240.bless_of_deep_sea_coral/fullset/vfx/3.mcfunction new file mode 100644 index 0000000000..3dae547a04 --- /dev/null +++ b/Asset/data/asset/functions/effect/0240.bless_of_deep_sea_coral/fullset/vfx/3.mcfunction @@ -0,0 +1,40 @@ +#> asset:effect/0240.bless_of_deep_sea_coral/fullset/vfx/3 +# +# +# +# @within function asset:effect/0240.bless_of_deep_sea_coral/fullset/equip + +# [ImportKey]: NobwRALgngDgpmAXGANgSwHYIDRgK55oAmSYRATAGYDsAxtQEaUC01ArAJxvMAsbAzB2YBDOByLMADD3Jx+ARmHkAbG2XkwuDMIC2CZIC3fAATzNYGMIBOugM5JwtAPZ4MEJPMm5KlxzvtgAN2EUPH1wAA8kTzAoKIBfONwIR38gkLCwSMRo2MR5BNxHSkobODds3AY4AC80OEso3DQbACEaussAUQBHPGCUKABlC1o4EkRKYNKC8Gh4UnQsMwJiUkl+MeU5amZaWgYeXh5qZWYADmp+M6kOcgYOYTYz2mVqHDBtPVJjDVwLax0dkQDmcrnc0W8vlSwVC-iyOXcBUgKWBgRhGXhADplLhcuRMWwkUUSmVGmAqrV6mTmm1KV1ev0hiMxkhJihpolZrB9KhMO8VuNyfxyDweJQiHBmA9yDseMp+BJhLQzpKeLceMqzsoePx5WZPjyfrtHDBYn8rLZ-E4XOUPF4fH5UWlYaj4bjEYlkdD0nCkFJse7EPjCZ7iaVytEKR1qa12vUen0UANhkqWRMpnAEgBdIA_3 +# 線 1 +particle dust 0.686 0.49 1 2 ^0 ^ ^0 0 0 0 0 1 +particle dust 0.686 0.49 1 2 ^0 ^ ^0.11111 0 0 0 0 1 +particle dust 0.686 0.49 1 2 ^0 ^ ^0.22222 0 0 0 0 1 +particle dust 0.686 0.49 1 2 ^0 ^ ^0.33333 0 0 0 0 1 +particle dust 0.686 0.49 1 2 ^0 ^ ^0.44444 0 0 0 0 1 +particle dust 0.686 0.49 1 2 ^0 ^ ^0.55556 0 0 0 0 1 +particle dust 0.686 0.49 1 2 ^0 ^ ^0.66667 0 0 0 0 1 +particle dust 0.686 0.49 1 2 ^0 ^ ^0.77778 0 0 0 0 1 +particle dust 0.686 0.49 1 2 ^0 ^ ^0.88889 0 0 0 0 1 +particle dust 0.686 0.49 1 2 ^0 ^ ^1 0 0 0 0 1 +# 線 2 +particle dust 0.686 0.49 1 2 ^0 ^ ^1 0 0 0 0 1 +particle dust 0.686 0.49 1 2 ^0.06667 ^ ^1.16667 0 0 0 0 1 +particle dust 0.686 0.49 1 2 ^0.13333 ^ ^1.33333 0 0 0 0 1 +particle dust 0.686 0.49 1 2 ^0.2 ^ ^1.5 0 0 0 0 1 +particle dust 0.686 0.49 1 2 ^0.26667 ^ ^1.66667 0 0 0 0 1 +particle dust 0.686 0.49 1 2 ^0.33333 ^ ^1.83333 0 0 0 0 1 +particle dust 0.686 0.49 1 2 ^0.4 ^ ^2 0 0 0 0 1 +particle dust 0.686 0.49 1 2 ^0.46667 ^ ^2.16667 0 0 0 0 1 +particle dust 0.686 0.49 1 2 ^0.53333 ^ ^2.33333 0 0 0 0 1 +particle dust 0.686 0.49 1 2 ^0.6 ^ ^2.5 0 0 0 0 1 +# 線 2-copy +particle dust 0.686 0.49 1 2 ^0 ^ ^1 0 0 0 0 1 +particle dust 0.686 0.49 1 2 ^-0.06667 ^ ^1.16667 0 0 0 0 1 +particle dust 0.686 0.49 1 2 ^-0.13333 ^ ^1.33333 0 0 0 0 1 +particle dust 0.686 0.49 1 2 ^-0.2 ^ ^1.5 0 0 0 0 1 +particle dust 0.686 0.49 1 2 ^-0.26667 ^ ^1.66667 0 0 0 0 1 +particle dust 0.686 0.49 1 2 ^-0.33333 ^ ^1.83333 0 0 0 0 1 +particle dust 0.686 0.49 1 2 ^-0.4 ^ ^2 0 0 0 0 1 +particle dust 0.686 0.49 1 2 ^-0.46667 ^ ^2.16667 0 0 0 0 1 +particle dust 0.686 0.49 1 2 ^-0.53333 ^ ^2.33333 0 0 0 0 1 +particle dust 0.686 0.49 1 2 ^-0.6 ^ ^2.5 0 0 0 0 1 diff --git a/Asset/data/asset/functions/effect/0240.bless_of_deep_sea_coral/fullset/vfx/4.mcfunction b/Asset/data/asset/functions/effect/0240.bless_of_deep_sea_coral/fullset/vfx/4.mcfunction new file mode 100644 index 0000000000..76ce8fbb66 --- /dev/null +++ b/Asset/data/asset/functions/effect/0240.bless_of_deep_sea_coral/fullset/vfx/4.mcfunction @@ -0,0 +1,40 @@ +#> asset:effect/0240.bless_of_deep_sea_coral/fullset/vfx/4 +# +# +# +# @within function asset:effect/0240.bless_of_deep_sea_coral/fullset/equip + +# [ImportKey]: NobwRALgngDgpmAXGANgSwHYIDRgK55oAmSYRATAGYDsAxtQEaUC01ArAJxvMAsbAzB2YBDOByLMADD3Jx+ARmHkAbG2XkwuDMIC2CZIC3fAATzNYGMIBOugM5JwtAPZ4MEJPMm5KlxzvtgAN2EUPH1wAA8kTzAoKIBfONwIR38gkLCwSMRo2MR5BNxHSkobODds3AY4AC80OEso3DQbACEaussAUQBHPGCUKABlC1o4EkRKYNKC8Gh4UnQsMwJiUkl+MeU5amZaWgYeXh5qZWYADmp+M6kOcgYOYTYz2mVqHDBtPVJjDVwLax0dkQDmcrnc0W8vlSwVC-iyOXcBUgKWBgRhGXhADplLhcuRMWwkUUSmVGmAqrV6mTmm1KV1ev0hiMxkhJihpolZrB9KhMO8VuNyfxyDweJQiHBmA9yDseMp+BJhLQzpKeLceMqzsoePx5WZPjyfrtHDBYn8rLZ-E4XOUPF4fH5UWlYaj4bjEYlkdD0nCkFJse7EPjCZ7iaVytEKR1qa12vUen0UANhkqWRMpnAEgBdIA_3 +# 線 1 +particle dust 1 0.549 1 2 ^0 ^ ^0 0 0 0 0 1 +particle dust 1 0.549 1 2 ^0 ^ ^0.11111 0 0 0 0 1 +particle dust 1 0.549 1 2 ^0 ^ ^0.22222 0 0 0 0 1 +particle dust 1 0.549 1 2 ^0 ^ ^0.33333 0 0 0 0 1 +particle dust 1 0.549 1 2 ^0 ^ ^0.44444 0 0 0 0 1 +particle dust 1 0.549 1 2 ^0 ^ ^0.55556 0 0 0 0 1 +particle dust 1 0.549 1 2 ^0 ^ ^0.66667 0 0 0 0 1 +particle dust 1 0.549 1 2 ^0 ^ ^0.77778 0 0 0 0 1 +particle dust 1 0.549 1 2 ^0 ^ ^0.88889 0 0 0 0 1 +particle dust 1 0.549 1 2 ^0 ^ ^1 0 0 0 0 1 +# 線 2 +particle dust 1 0.549 1 2 ^0 ^ ^1 0 0 0 0 1 +particle dust 1 0.549 1 2 ^0.06667 ^ ^1.16667 0 0 0 0 1 +particle dust 1 0.549 1 2 ^0.13333 ^ ^1.33333 0 0 0 0 1 +particle dust 1 0.549 1 2 ^0.2 ^ ^1.5 0 0 0 0 1 +particle dust 1 0.549 1 2 ^0.26667 ^ ^1.66667 0 0 0 0 1 +particle dust 1 0.549 1 2 ^0.33333 ^ ^1.83333 0 0 0 0 1 +particle dust 1 0.549 1 2 ^0.4 ^ ^2 0 0 0 0 1 +particle dust 1 0.549 1 2 ^0.46667 ^ ^2.16667 0 0 0 0 1 +particle dust 1 0.549 1 2 ^0.53333 ^ ^2.33333 0 0 0 0 1 +particle dust 1 0.549 1 2 ^0.6 ^ ^2.5 0 0 0 0 1 +# 線 2-copy +particle dust 1 0.549 1 2 ^0 ^ ^1 0 0 0 0 1 +particle dust 1 0.549 1 2 ^-0.06667 ^ ^1.16667 0 0 0 0 1 +particle dust 1 0.549 1 2 ^-0.13333 ^ ^1.33333 0 0 0 0 1 +particle dust 1 0.549 1 2 ^-0.2 ^ ^1.5 0 0 0 0 1 +particle dust 1 0.549 1 2 ^-0.26667 ^ ^1.66667 0 0 0 0 1 +particle dust 1 0.549 1 2 ^-0.33333 ^ ^1.83333 0 0 0 0 1 +particle dust 1 0.549 1 2 ^-0.4 ^ ^2 0 0 0 0 1 +particle dust 1 0.549 1 2 ^-0.46667 ^ ^2.16667 0 0 0 0 1 +particle dust 1 0.549 1 2 ^-0.53333 ^ ^2.33333 0 0 0 0 1 +particle dust 1 0.549 1 2 ^-0.6 ^ ^2.5 0 0 0 0 1 diff --git a/Asset/data/asset/functions/effect/0240.bless_of_deep_sea_coral/given/.mcfunction b/Asset/data/asset/functions/effect/0240.bless_of_deep_sea_coral/given/.mcfunction new file mode 100644 index 0000000000..6714ae457c --- /dev/null +++ b/Asset/data/asset/functions/effect/0240.bless_of_deep_sea_coral/given/.mcfunction @@ -0,0 +1,11 @@ +#> asset:effect/0240.bless_of_deep_sea_coral/given/ +# +# Effectが付与された時の処理 +# +# @within function asset:effect/0240.bless_of_deep_sea_coral/_/given + +# フルセット効果を付与 + execute if data storage asset:context {Stack:4} run function asset:effect/0240.bless_of_deep_sea_coral/fullset/equip + +# スタックを記録 + data modify storage asset:context this.PrevStack set from storage asset:context Stack diff --git a/Asset/data/asset/functions/effect/0240.bless_of_deep_sea_coral/re-given/.mcfunction b/Asset/data/asset/functions/effect/0240.bless_of_deep_sea_coral/re-given/.mcfunction new file mode 100644 index 0000000000..17fcff1fd8 --- /dev/null +++ b/Asset/data/asset/functions/effect/0240.bless_of_deep_sea_coral/re-given/.mcfunction @@ -0,0 +1,14 @@ +#> asset:effect/0240.bless_of_deep_sea_coral/re-given/ +# +# Effectが上書きされた時の処理 +# +# @within function asset:effect/0240.bless_of_deep_sea_coral/_/re-given + +# フルセット効果を削除 + execute if data storage asset:context PreviousField{PrevStack:4} unless data storage asset:context {Stack:4} run function asset:effect/0240.bless_of_deep_sea_coral/fullset/dis_equip + +# フルセット効果を付与 + execute unless data storage asset:context PreviousField{PrevStack:4} if data storage asset:context {Stack:4} run function asset:effect/0240.bless_of_deep_sea_coral/fullset/equip + +# スタックを記録 + data modify storage asset:context this.PrevStack set from storage asset:context Stack diff --git a/Asset/data/asset/functions/effect/0240.bless_of_deep_sea_coral/register.mcfunction b/Asset/data/asset/functions/effect/0240.bless_of_deep_sea_coral/register.mcfunction new file mode 100644 index 0000000000..be472f1d2b --- /dev/null +++ b/Asset/data/asset/functions/effect/0240.bless_of_deep_sea_coral/register.mcfunction @@ -0,0 +1,32 @@ +#> asset:effect/0240.bless_of_deep_sea_coral/register +# +# Effectのデータを指定 +# +# @within function asset:effect/0240.bless_of_deep_sea_coral/_/register + +# ExtendsSafe (boolean) (default = false) + # data modify storage asset:effect ExtendsSafe set value true +# ID (int) + data modify storage asset:effect ID set value 240 +# 名前 (TextComponentString) + data modify storage asset:effect Name set value '[{"text":"深","color":"#c6e3ff"},{"text":"海","color":"#c6c9ff"},{"text":"珊","color":"#dfccfe"},{"text":"瑚","color":"#fecffe"}]' +# 説明文 (TextComponentString[]) + data modify storage asset:effect Description set value ['{"text":"水に触れると特殊な効果を受ける。"}','{"text":"水攻撃 +5%","color":"green"}'] +# 効果時間 (int) (default = API || error) + data modify storage asset:effect Duration set value 2147483647 +# スタック (int) (default = API || 1) + # data modify storage asset:effect Stack set value +# 効果時間の操作方法 (default = API || "replace") + # data modify storage asset:effect DurationOperation set value +# スタックの操作方法 (default = API || "replace") + data modify storage asset:effect StackOperation set value "forceReplace" +# 最大効果時間 (int) (default = 2147483647) + # data modify storage asset:effect MaxDuration set value +# 最大スタック (int) (default = 2147483647) + data modify storage asset:effect MaxStack set value 4 +# 悪い効果か否か (boolean) + data modify storage asset:effect IsBadEffect set value false +# 死亡時のエフェクトの処理 (default = "remove") + # data modify storage asset:effect ProcessOnDied set value +# 消すのに必要なレベル (int) (default = 1) + data modify storage asset:effect RequireClearLv set value 4 diff --git a/Asset/data/asset/functions/effect/0240.bless_of_deep_sea_coral/remove/.mcfunction b/Asset/data/asset/functions/effect/0240.bless_of_deep_sea_coral/remove/.mcfunction new file mode 100644 index 0000000000..4cebab1e9f --- /dev/null +++ b/Asset/data/asset/functions/effect/0240.bless_of_deep_sea_coral/remove/.mcfunction @@ -0,0 +1,8 @@ +#> asset:effect/0240.bless_of_deep_sea_coral/remove/ +# +# Effectが削除された時の処理 +# +# @within function asset:effect/0240.bless_of_deep_sea_coral/_/remove + +# フルセット効果を削除 + execute if data storage asset:context {Stack:4} run function asset:effect/0240.bless_of_deep_sea_coral/fullset/dis_equip diff --git a/Asset/data/asset/functions/effect/0240.bless_of_deep_sea_coral/tick/.mcfunction b/Asset/data/asset/functions/effect/0240.bless_of_deep_sea_coral/tick/.mcfunction new file mode 100644 index 0000000000..7d1a1c9684 --- /dev/null +++ b/Asset/data/asset/functions/effect/0240.bless_of_deep_sea_coral/tick/.mcfunction @@ -0,0 +1,8 @@ +#> asset:effect/0240.bless_of_deep_sea_coral/tick/ +# +# Effectのtick処理 +# +# @within function asset:effect/0240.bless_of_deep_sea_coral/_/tick + +# 演出 + execute if data storage asset:context {Stack:4} run function asset:effect/0240.bless_of_deep_sea_coral/fullset/passive diff --git a/Asset/data/asset/functions/effect/0241.all_night/_/register.mcfunction b/Asset/data/asset/functions/effect/0241.all_night/_/register.mcfunction new file mode 100644 index 0000000000..f7966be56d --- /dev/null +++ b/Asset/data/asset/functions/effect/0241.all_night/_/register.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0241.all_night/_/register +# +# +# +# @within tag/function asset:effect/register + +execute if data storage asset:context {id:241} run function asset:effect/0241.all_night/register \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0241.all_night/register.mcfunction b/Asset/data/asset/functions/effect/0241.all_night/register.mcfunction new file mode 100644 index 0000000000..a27783c200 --- /dev/null +++ b/Asset/data/asset/functions/effect/0241.all_night/register.mcfunction @@ -0,0 +1,32 @@ +#> asset:effect/0241.all_night/register +# +# Effectのデータを指定 +# +# @within function asset:effect/0241.all_night/_/register + +# ExtendsSafe (boolean) (default = false) + # data modify storage asset:effect ExtendsSafe set value true +# ID (int) + data modify storage asset:effect ID set value 241 +# 名前 (TextComponentString) + data modify storage asset:effect Name set value '{"text":"終夜","color":"dark_purple","bold":true,"underlined":true}' +# 説明文 (TextComponentString[]) + data modify storage asset:effect Description set value ['{"text":"夜の間に全てを装備しているとき、"}','{"text":"近接攻撃に追撃が発生し、わずかに体力が回復する。"}'] +# 効果時間 (int) (default = API || error) + data modify storage asset:effect Duration set value 2147483647 +# スタック (int) (default = API || 1) + # data modify storage asset:effect Stack set value +# 効果時間の操作方法 (default = API || "replace") + # data modify storage asset:effect DurationOperation set value +# スタックの操作方法 (default = API || "replace") + data modify storage asset:effect StackOperation set value "forceReplace" +# 最大効果時間 (int) (default = 2147483647) + # data modify storage asset:effect MaxDuration set value +# 最大スタック (int) (default = 2147483647) + data modify storage asset:effect MaxStack set value 4 +# 悪い効果か否か (boolean) + data modify storage asset:effect IsBadEffect set value false +# 死亡時のエフェクトの処理 (default = "remove") + # data modify storage asset:effect ProcessOnDied set value +# 消すのに必要なレベル (int) (default = 1) + data modify storage asset:effect RequireClearLv set value 4 diff --git a/Asset/data/asset/functions/effect/0242.catastrophe/_/register.mcfunction b/Asset/data/asset/functions/effect/0242.catastrophe/_/register.mcfunction new file mode 100644 index 0000000000..04d4a904f7 --- /dev/null +++ b/Asset/data/asset/functions/effect/0242.catastrophe/_/register.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0242.catastrophe/_/register +# +# +# +# @within tag/function asset:effect/register + +execute if data storage asset:context {id:242} run function asset:effect/0242.catastrophe/register \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0242.catastrophe/register.mcfunction b/Asset/data/asset/functions/effect/0242.catastrophe/register.mcfunction new file mode 100644 index 0000000000..902e395a75 --- /dev/null +++ b/Asset/data/asset/functions/effect/0242.catastrophe/register.mcfunction @@ -0,0 +1,32 @@ +#> asset:effect/0242.catastrophe/register +# +# Effectのデータを指定 +# +# @within function asset:effect/0242.catastrophe/_/register + +# ExtendsSafe (boolean) (default = false) + # data modify storage asset:effect ExtendsSafe set value true +# ID (int) + data modify storage asset:effect ID set value 242 +# 名前 (TextComponentString) + data modify storage asset:effect Name set value '[{"text":"†","color":"white"},{"text":"カタストロフィ","color":"gray"},{"text":"†","color":"white"}]' +# 説明文 (TextComponentString[]) + data modify storage asset:effect Description set value ['{"text":"繋がる総てを身に纏ったとき、"}','{"text":"自らを傷付けた相手に復讐を行う。"}'] +# 効果時間 (int) (default = API || error) + data modify storage asset:effect Duration set value 2147483647 +# スタック (int) (default = API || 1) + # data modify storage asset:effect Stack set value +# 効果時間の操作方法 (default = API || "replace") + # data modify storage asset:effect DurationOperation set value +# スタックの操作方法 (default = API || "replace") + data modify storage asset:effect StackOperation set value "forceReplace" +# 最大効果時間 (int) (default = 2147483647) + # data modify storage asset:effect MaxDuration set value +# 最大スタック (int) (default = 2147483647) + data modify storage asset:effect MaxStack set value 4 +# 悪い効果か否か (boolean) + data modify storage asset:effect IsBadEffect set value false +# 死亡時のエフェクトの処理 (default = "remove") + # data modify storage asset:effect ProcessOnDied set value +# 消すのに必要なレベル (int) (default = 1) + data modify storage asset:effect RequireClearLv set value 4 diff --git a/Asset/data/asset/functions/effect/0243.oblivious_snow/_/given.mcfunction b/Asset/data/asset/functions/effect/0243.oblivious_snow/_/given.mcfunction new file mode 100644 index 0000000000..9202018539 --- /dev/null +++ b/Asset/data/asset/functions/effect/0243.oblivious_snow/_/given.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0243.oblivious_snow/_/given +# +# Effectが付与された時に実行されるfunction +# +# @within tag/function asset:effect/given + +execute if data storage asset:context {id:243} run function asset:effect/0243.oblivious_snow/given/ \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0243.oblivious_snow/_/re-given.mcfunction b/Asset/data/asset/functions/effect/0243.oblivious_snow/_/re-given.mcfunction new file mode 100644 index 0000000000..c3ec76dc14 --- /dev/null +++ b/Asset/data/asset/functions/effect/0243.oblivious_snow/_/re-given.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0243.oblivious_snow/_/re-given +# +# Effectが上書きされた時に実行されるfunction +# +# @within tag/function asset:effect/re-given + +execute if data storage asset:context {id:243} run function asset:effect/0243.oblivious_snow/re-given/ \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0243.oblivious_snow/_/register.mcfunction b/Asset/data/asset/functions/effect/0243.oblivious_snow/_/register.mcfunction new file mode 100644 index 0000000000..4be1f74e71 --- /dev/null +++ b/Asset/data/asset/functions/effect/0243.oblivious_snow/_/register.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0243.oblivious_snow/_/register +# +# +# +# @within tag/function asset:effect/register + +execute if data storage asset:context {id:243} run function asset:effect/0243.oblivious_snow/register \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0243.oblivious_snow/_/remove.mcfunction b/Asset/data/asset/functions/effect/0243.oblivious_snow/_/remove.mcfunction new file mode 100644 index 0000000000..e4300d80c0 --- /dev/null +++ b/Asset/data/asset/functions/effect/0243.oblivious_snow/_/remove.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0243.oblivious_snow/_/remove +# +# Effectが神器や牛乳によって削除された時に実行されるfunction +# +# @within tag/function asset:effect/remove + +execute if data storage asset:context {id:243} run function asset:effect/0243.oblivious_snow/remove/ \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0243.oblivious_snow/_/tick.mcfunction b/Asset/data/asset/functions/effect/0243.oblivious_snow/_/tick.mcfunction new file mode 100644 index 0000000000..ab88401eeb --- /dev/null +++ b/Asset/data/asset/functions/effect/0243.oblivious_snow/_/tick.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0243.oblivious_snow/_/tick +# +# Effectが発動している間毎tick実行されるfunction +# +# @within tag/function asset:effect/tick + +execute if data storage asset:context {id:243} run function asset:effect/0243.oblivious_snow/tick/ \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0243.oblivious_snow/fullset/dis_equip.mcfunction b/Asset/data/asset/functions/effect/0243.oblivious_snow/fullset/dis_equip.mcfunction new file mode 100644 index 0000000000..1cbe1b2110 --- /dev/null +++ b/Asset/data/asset/functions/effect/0243.oblivious_snow/fullset/dis_equip.mcfunction @@ -0,0 +1,13 @@ +#> asset:effect/0243.oblivious_snow/fullset/dis_equip +# @within function +# asset:effect/0243.oblivious_snow/re-given/ +# asset:effect/0243.oblivious_snow/remove/ + +# 補正 + # 水攻撃 + data modify storage api: Argument.UUID set value [I;1,3,243,0] + function api:modifier/attack/water/remove + + # 被回復量 + data modify storage api: Argument.UUID set value [I;1,3,243,0] + function api:modifier/receive_heal/remove diff --git a/Asset/data/asset/functions/effect/0243.oblivious_snow/fullset/equip.mcfunction b/Asset/data/asset/functions/effect/0243.oblivious_snow/fullset/equip.mcfunction new file mode 100644 index 0000000000..f296d97c93 --- /dev/null +++ b/Asset/data/asset/functions/effect/0243.oblivious_snow/fullset/equip.mcfunction @@ -0,0 +1,23 @@ +#> asset:effect/0243.oblivious_snow/fullset/equip +# @within function asset:effect/0243.oblivious_snow/*given/ + +# 補正 + # 水攻撃+25% + data modify storage api: Argument.UUID set value [I;1,3,243,0] + data modify storage api: Argument.Amount set value 0.25 + data modify storage api: Argument.Operation set value "multiply_base" + function api:modifier/attack/water/add + + # MP回復量-15% + data modify storage api: Argument.UUID set value [I;1,3,243,0] + data modify storage api: Argument.Amount set value -0.15 + data modify storage api: Argument.Operation set value "multiply_base" + function api:modifier/receive_heal/add + +# 演出 + particle snowflake ~ ~1.2 ~ 1 0.6 1 0.2 250 normal @a + particle snowflake ~ ~1.2 ~ 1 0.6 1 0.4 250 normal @a + playsound minecraft:block.powder_snow.step player @a ~ ~ ~ 1 0.5 0 + playsound minecraft:block.powder_snow.step player @a ~ ~ ~ 1 0.0 0 + playsound ogg:mob.vex.death2 player @a ~ ~ ~ 0.5 0.4 + playsound ogg:mob.vex.idle3 player @a ~ ~ ~ 0.5 0.2 diff --git a/Asset/data/asset/functions/effect/0243.oblivious_snow/fullset/passive.mcfunction b/Asset/data/asset/functions/effect/0243.oblivious_snow/fullset/passive.mcfunction new file mode 100644 index 0000000000..c14026a2a4 --- /dev/null +++ b/Asset/data/asset/functions/effect/0243.oblivious_snow/fullset/passive.mcfunction @@ -0,0 +1,9 @@ +#> asset:effect/0243.oblivious_snow/fullset/passive +# @within function asset:effect/0243.oblivious_snow/tick/ + +# 演出 + particle snowflake ~ ~4 ~ 1.8 0.25 1.8 0.0 9 normal @a[distance=..16] + particle snowflake ~ ~0.3 ~ 1.5 0.1 1.5 0.1 2 normal @a[distance=..16] + +# 周囲に鈍足を付与 + effect give @e[type=#lib:living,tag=Enemy,tag=!Enemy.Boss,distance=..3.5] slowness 1 0 true diff --git a/Asset/data/asset/functions/effect/0243.oblivious_snow/given/.mcfunction b/Asset/data/asset/functions/effect/0243.oblivious_snow/given/.mcfunction new file mode 100644 index 0000000000..3653a15d06 --- /dev/null +++ b/Asset/data/asset/functions/effect/0243.oblivious_snow/given/.mcfunction @@ -0,0 +1,11 @@ +#> asset:effect/0243.oblivious_snow/given/ +# +# Effectが付与された時の処理 +# +# @within function asset:effect/0243.oblivious_snow/_/given + +# フルセット効果を付与 + execute if data storage asset:context {Stack:4} run function asset:effect/0243.oblivious_snow/fullset/equip + +# スタックを記録 + data modify storage asset:context this.PrevStack set from storage asset:context Stack diff --git a/Asset/data/asset/functions/effect/0243.oblivious_snow/re-given/.mcfunction b/Asset/data/asset/functions/effect/0243.oblivious_snow/re-given/.mcfunction new file mode 100644 index 0000000000..ea462e5639 --- /dev/null +++ b/Asset/data/asset/functions/effect/0243.oblivious_snow/re-given/.mcfunction @@ -0,0 +1,14 @@ +#> asset:effect/0243.oblivious_snow/re-given/ +# +# Effectが上書きされた時の処理 +# +# @within function asset:effect/0243.oblivious_snow/_/re-given + +# フルセット効果を削除 + execute if data storage asset:context PreviousField{PrevStack:4} unless data storage asset:context {Stack:4} run function asset:effect/0243.oblivious_snow/fullset/dis_equip + +# フルセット効果を付与 + execute unless data storage asset:context PreviousField{PrevStack:4} if data storage asset:context {Stack:4} run function asset:effect/0243.oblivious_snow/fullset/equip + +# スタックを記録 + data modify storage asset:context this.PrevStack set from storage asset:context Stack diff --git a/Asset/data/asset/functions/effect/0243.oblivious_snow/register.mcfunction b/Asset/data/asset/functions/effect/0243.oblivious_snow/register.mcfunction new file mode 100644 index 0000000000..d5c8c5cd7f --- /dev/null +++ b/Asset/data/asset/functions/effect/0243.oblivious_snow/register.mcfunction @@ -0,0 +1,32 @@ +#> asset:effect/0243.oblivious_snow/register +# +# Effectのデータを指定 +# +# @within function asset:effect/0243.oblivious_snow/_/register + +# ExtendsSafe (boolean) (default = false) + # data modify storage asset:effect ExtendsSafe set value true +# ID (int) + data modify storage asset:effect ID set value 243 +# 名前 (TextComponentString) + data modify storage asset:effect Name set value '{"text":"忘却の白雪","color":"#ABF4FF"}' +# 説明文 (TextComponentString[]) + data modify storage asset:effect Description set value ['{"text":"白雪で身を覆った時、"}','{"text":"攻撃に対して追撃が発生し、"}','{"text":"周囲の動きを鈍らせる。"}','{"text":"水攻撃 +25%","color":"green"}','{"text":"回復(受) -15%","color":"red"}'] +# 効果時間 (int) (default = API || error) + data modify storage asset:effect Duration set value 2147483647 +# スタック (int) (default = API || 1) + # data modify storage asset:effect Stack set value +# 効果時間の操作方法 (default = API || "replace") + # data modify storage asset:effect DurationOperation set value +# スタックの操作方法 (default = API || "replace") + data modify storage asset:effect StackOperation set value "forceReplace" +# 最大効果時間 (int) (default = 2147483647) + # data modify storage asset:effect MaxDuration set value +# 最大スタック (int) (default = 2147483647) + data modify storage asset:effect MaxStack set value 4 +# 悪い効果か否か (boolean) + data modify storage asset:effect IsBadEffect set value false +# 死亡時のエフェクトの処理 (default = "remove") + # data modify storage asset:effect ProcessOnDied set value +# 消すのに必要なレベル (int) (default = 1) + data modify storage asset:effect RequireClearLv set value 4 diff --git a/Asset/data/asset/functions/effect/0243.oblivious_snow/remove/.mcfunction b/Asset/data/asset/functions/effect/0243.oblivious_snow/remove/.mcfunction new file mode 100644 index 0000000000..2d348cf007 --- /dev/null +++ b/Asset/data/asset/functions/effect/0243.oblivious_snow/remove/.mcfunction @@ -0,0 +1,8 @@ +#> asset:effect/0243.oblivious_snow/remove/ +# +# Effectが削除された時の処理 +# +# @within function asset:effect/0243.oblivious_snow/_/remove + +# フルセット効果を削除 + execute if data storage asset:context {Stack:4} run function asset:effect/0243.oblivious_snow/fullset/dis_equip diff --git a/Asset/data/asset/functions/effect/0243.oblivious_snow/tick/.mcfunction b/Asset/data/asset/functions/effect/0243.oblivious_snow/tick/.mcfunction new file mode 100644 index 0000000000..73701c5de1 --- /dev/null +++ b/Asset/data/asset/functions/effect/0243.oblivious_snow/tick/.mcfunction @@ -0,0 +1,8 @@ +#> asset:effect/0243.oblivious_snow/tick/ +# +# Effectのtick処理 +# +# @within function asset:effect/0243.oblivious_snow/_/tick + +# 演出 + execute if data storage asset:context {Stack:4} run function asset:effect/0243.oblivious_snow/fullset/passive diff --git a/Asset/data/asset/functions/effect/0244.aurora_armor/_/given.mcfunction b/Asset/data/asset/functions/effect/0244.aurora_armor/_/given.mcfunction new file mode 100644 index 0000000000..a424bcc20d --- /dev/null +++ b/Asset/data/asset/functions/effect/0244.aurora_armor/_/given.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0244.aurora_armor/_/given +# +# Effectが付与された時に実行されるfunction +# +# @within tag/function asset:effect/given + +execute if data storage asset:context {id:244} run function asset:effect/0244.aurora_armor/given/ \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0244.aurora_armor/_/re-given.mcfunction b/Asset/data/asset/functions/effect/0244.aurora_armor/_/re-given.mcfunction new file mode 100644 index 0000000000..d44b8810d0 --- /dev/null +++ b/Asset/data/asset/functions/effect/0244.aurora_armor/_/re-given.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0244.aurora_armor/_/re-given +# +# Effectが上書きされた時に実行されるfunction +# +# @within tag/function asset:effect/re-given + +execute if data storage asset:context {id:244} run function asset:effect/0244.aurora_armor/re-given/ \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0244.aurora_armor/_/register.mcfunction b/Asset/data/asset/functions/effect/0244.aurora_armor/_/register.mcfunction new file mode 100644 index 0000000000..0137262933 --- /dev/null +++ b/Asset/data/asset/functions/effect/0244.aurora_armor/_/register.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0244.aurora_armor/_/register +# +# +# +# @within tag/function asset:effect/register + +execute if data storage asset:context {id:244} run function asset:effect/0244.aurora_armor/register \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0244.aurora_armor/_/remove.mcfunction b/Asset/data/asset/functions/effect/0244.aurora_armor/_/remove.mcfunction new file mode 100644 index 0000000000..1e1ee84cb1 --- /dev/null +++ b/Asset/data/asset/functions/effect/0244.aurora_armor/_/remove.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0244.aurora_armor/_/remove +# +# Effectが神器や牛乳によって削除された時に実行されるfunction +# +# @within tag/function asset:effect/re-given + +execute if data storage asset:context {id:244} run function asset:effect/0244.aurora_armor/remove/ diff --git a/Asset/data/asset/functions/effect/0244.aurora_armor/_/tick.mcfunction b/Asset/data/asset/functions/effect/0244.aurora_armor/_/tick.mcfunction new file mode 100644 index 0000000000..4cdd3f90c4 --- /dev/null +++ b/Asset/data/asset/functions/effect/0244.aurora_armor/_/tick.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0244.aurora_armor/_/tick +# +# Effectが発動している間毎tick実行されるfunction +# +# @within tag/function asset:effect/tick + +execute if data storage asset:context {id:244} run function asset:effect/0244.aurora_armor/tick/ \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0244.aurora_armor/fullset/dis_equip.mcfunction b/Asset/data/asset/functions/effect/0244.aurora_armor/fullset/dis_equip.mcfunction new file mode 100644 index 0000000000..e972c14bbf --- /dev/null +++ b/Asset/data/asset/functions/effect/0244.aurora_armor/fullset/dis_equip.mcfunction @@ -0,0 +1,12 @@ +#> asset:effect/0244.aurora_armor/fullset/dis_equip +# @within function +# asset:effect/0244.aurora_armor/re-given/ +# asset:effect/0244.aurora_armor/remove/ + +# 雷攻撃 + data modify storage api: Argument.UUID set value [I;1,3,244,0] + function api:modifier/attack/thunder/remove + +# MP回復 + data modify storage api: Argument.UUID set value [I;1,3,244,0] + function api:modifier/mp_regen/remove diff --git a/Asset/data/asset/functions/effect/0244.aurora_armor/fullset/equip.mcfunction b/Asset/data/asset/functions/effect/0244.aurora_armor/fullset/equip.mcfunction new file mode 100644 index 0000000000..6fc85def85 --- /dev/null +++ b/Asset/data/asset/functions/effect/0244.aurora_armor/fullset/equip.mcfunction @@ -0,0 +1,20 @@ +#> asset:effect/0244.aurora_armor/fullset/equip +# @within function asset:effect/0244.aurora_armor/*given/ + +# 演出 + execute rotated ~ 0 positioned ~ ~0.3 ~ run function asset:effect/0244.aurora_armor/fullset/vfx + playsound entity.evoker.prepare_summon player @a ~ ~ ~ 0.8 2 0 + playsound entity.evoker.prepare_summon player @a ~ ~ ~ 0.7 1.8 0 + playsound entity.evoker.prepare_summon player @a ~ ~ ~ 0.6 1.6 0 + +# 雷攻撃+10% + data modify storage api: Argument.UUID set value [I;1,3,244,0] + data modify storage api: Argument.Amount set value 0.1 + data modify storage api: Argument.Operation set value "multiply_base" + function api:modifier/attack/thunder/add + +# MP回復+10% + data modify storage api: Argument.UUID set value [I;1,3,244,0] + data modify storage api: Argument.Amount set value 0.1 + data modify storage api: Argument.Operation set value "multiply_base" + function api:modifier/mp_regen/add diff --git a/Asset/data/asset/functions/effect/0244.aurora_armor/fullset/passive.mcfunction b/Asset/data/asset/functions/effect/0244.aurora_armor/fullset/passive.mcfunction new file mode 100644 index 0000000000..6e7aff106a --- /dev/null +++ b/Asset/data/asset/functions/effect/0244.aurora_armor/fullset/passive.mcfunction @@ -0,0 +1,9 @@ +#> asset:effect/0244.aurora_armor/fullset/passive +# @within function asset:effect/0244.aurora_armor/tick/ + +# 演出 + particle dust_color_transition 0.000 1.000 0.886 1.2 0.000 0.545 1.000 ~ ~1.2 ~ 1.2 0.6 1.2 0 2 normal @a + +# 隠し効果くらいの気持ちのeffect + execute if predicate lib:is_night if predicate lib:weather/is_sunny run effect give @s speed 1 0 true + execute if predicate lib:is_night if predicate lib:weather/is_sunny run effect give @s night_vision 11 0 true diff --git a/Asset/data/asset/functions/effect/0244.aurora_armor/fullset/vfx.mcfunction b/Asset/data/asset/functions/effect/0244.aurora_armor/fullset/vfx.mcfunction new file mode 100644 index 0000000000..156112b43d --- /dev/null +++ b/Asset/data/asset/functions/effect/0244.aurora_armor/fullset/vfx.mcfunction @@ -0,0 +1,290 @@ +#> asset:effect/0244.aurora_armor/fullset/vfx +# @within function asset:effect/0244.aurora_armor/fullset/equip + +# [ImportKey]: NobwRALgngDgpmAXGAxgSwE4oDYIDRgCuhaAJkmACwCscARinQGZMC0ATAGwDsnrlTbu1Z0AjMw7cADNwCGATjkBmFVLAEAdrIC2CZIDDFAASj1YGLIw6AzknAoA9oQ0QknKQRRxncDLbAA3WWxCPXAADyR3MChIgF9YgktSNEIbREoAOmoCKwgLF0QouGxsNBgrPVEpKIx7PIg9KLQrAFESsoqWgEdCIOwoAGVzT3JEJiCK+LxwaHgKdCxcU2IyClJPdiZ2JSl+dnlhSllOYXk6KT4lWW4mJUp76gF5Uy1dCiN2U3NLbTS7R2cSGo7A8XgavkQ4ECwVCYAihQIMUKUzASRSaUoOTyGAKRXa5Uq1USdVkDUiBGabVKBO6vRKg2GcFG42wkwSM1gelQmBw+CIJFGYFINwAHKRRJR5PwpOd+Nw6MI6NwdiJZOwbkoRdRxKQ1JodFyjEovhZrH4HE4CpQRaDvBCoUEQn54VEkVIUWjUkglFksflyWBitSKkgqjUSWSEWBKfjOj0+gzZCMkCy2dNIJz5jylgQVoLSONuGLqChWExRIo9iK4KxZGrSCIuKRgdVuHA1S8De9DJQTT8-qgAVbMagwT4-NCnZC4QG3R7ZMkvYglH6cQGgx1CeH6o0Ka1Y3BaQmhkmmSmJnAphy5sgFrzlgKKHAUMKpHAmJQRNxxXtRA35KIIqHPInAoJw8glvIIooLInZvAYhjUH2ZrThagLpFEnh2hOjqwi6iJxAkqILuiSDsL6YC5P6UYbgSoZEqiEa7tG+7Boe8b0ieyZjBeV4Zje3KLHyeYUGIIonKILCsOs7CiPwkkNnQSicCKrAivITB0HQ2pwNWIp0HBhqGJwyG-OaQ7epwtrgjhMLOrOhGJCRS4gpR2K4gQtEhogYbEjuAYxmxR6cYyzK8bEAC6QA_3 +# 円 1 +particle dust 0.000 1.000 0.886 3.5 ^0 ^ ^-4.5 0 0 0 0 1 +particle dust 0.000 1.000 0.886 3.5 ^0.47038 ^ ^-4.47535 0 0 0 0 1 +particle dust 0.000 1.000 0.886 3.5 ^0.9356 ^ ^-4.40166 0 0 0 0 1 +particle dust 0.000 1.000 0.886 3.5 ^1.39058 ^ ^-4.27975 0 0 0 0 1 +particle dust 0.000 1.000 0.886 3.5 ^1.83031 ^ ^-4.11095 0 0 0 0 1 +particle dust 0.000 1.000 0.886 3.5 ^2.25 ^ ^-3.89711 0 0 0 0 1 +particle dust 0.000 1.000 0.886 3.5 ^2.64503 ^ ^-3.64058 0 0 0 0 1 +particle dust 0.000 1.000 0.886 3.5 ^3.01109 ^ ^-3.34415 0 0 0 0 1 +particle dust 0.000 1.000 0.886 3.5 ^3.34415 ^ ^-3.01109 0 0 0 0 1 +particle dust 0.000 1.000 0.886 3.5 ^3.64058 ^ ^-2.64503 0 0 0 0 1 +particle dust 0.000 1.000 0.886 3.5 ^3.89711 ^ ^-2.25 0 0 0 0 1 +particle dust 0.000 1.000 0.886 3.5 ^4.11095 ^ ^-1.83031 0 0 0 0 1 +particle dust 0.000 1.000 0.886 3.5 ^4.27975 ^ ^-1.39058 0 0 0 0 1 +particle dust 0.000 1.000 0.886 3.5 ^4.40166 ^ ^-0.9356 0 0 0 0 1 +particle dust 0.000 1.000 0.886 3.5 ^4.47535 ^ ^-0.47038 0 0 0 0 1 +particle dust 0.000 1.000 0.886 3.5 ^4.5 ^ ^0 0 0 0 0 1 +particle dust 0.000 1.000 0.886 3.5 ^4.47535 ^ ^0.47038 0 0 0 0 1 +particle dust 0.000 1.000 0.886 3.5 ^4.40166 ^ ^0.9356 0 0 0 0 1 +particle dust 0.000 1.000 0.886 3.5 ^4.27975 ^ ^1.39058 0 0 0 0 1 +particle dust 0.000 1.000 0.886 3.5 ^4.11095 ^ ^1.83031 0 0 0 0 1 +particle dust 0.000 1.000 0.886 3.5 ^3.89711 ^ ^2.25 0 0 0 0 1 +particle dust 0.000 1.000 0.886 3.5 ^3.64058 ^ ^2.64503 0 0 0 0 1 +particle dust 0.000 1.000 0.886 3.5 ^3.34415 ^ ^3.01109 0 0 0 0 1 +particle dust 0.000 1.000 0.886 3.5 ^3.01109 ^ ^3.34415 0 0 0 0 1 +particle dust 0.000 1.000 0.886 3.5 ^2.64503 ^ ^3.64058 0 0 0 0 1 +particle dust 0.000 1.000 0.886 3.5 ^2.25 ^ ^3.89711 0 0 0 0 1 +particle dust 0.000 1.000 0.886 3.5 ^1.83031 ^ ^4.11095 0 0 0 0 1 +particle dust 0.000 1.000 0.886 3.5 ^1.39058 ^ ^4.27975 0 0 0 0 1 +particle dust 0.000 1.000 0.886 3.5 ^0.9356 ^ ^4.40166 0 0 0 0 1 +particle dust 0.000 1.000 0.886 3.5 ^0.47038 ^ ^4.47535 0 0 0 0 1 +particle dust 0.000 1.000 0.886 3.5 ^0 ^ ^4.5 0 0 0 0 1 +particle dust 0.000 1.000 0.886 3.5 ^-0.47038 ^ ^4.47535 0 0 0 0 1 +particle dust 0.000 1.000 0.886 3.5 ^-0.9356 ^ ^4.40166 0 0 0 0 1 +particle dust 0.000 1.000 0.886 3.5 ^-1.39058 ^ ^4.27975 0 0 0 0 1 +particle dust 0.000 1.000 0.886 3.5 ^-1.83031 ^ ^4.11095 0 0 0 0 1 +particle dust 0.000 1.000 0.886 3.5 ^-2.25 ^ ^3.89711 0 0 0 0 1 +particle dust 0.000 1.000 0.886 3.5 ^-2.64503 ^ ^3.64058 0 0 0 0 1 +particle dust 0.000 1.000 0.886 3.5 ^-3.01109 ^ ^3.34415 0 0 0 0 1 +particle dust 0.000 1.000 0.886 3.5 ^-3.34415 ^ ^3.01109 0 0 0 0 1 +particle dust 0.000 1.000 0.886 3.5 ^-3.64058 ^ ^2.64503 0 0 0 0 1 +particle dust 0.000 1.000 0.886 3.5 ^-3.89711 ^ ^2.25 0 0 0 0 1 +particle dust 0.000 1.000 0.886 3.5 ^-4.11095 ^ ^1.83031 0 0 0 0 1 +particle dust 0.000 1.000 0.886 3.5 ^-4.27975 ^ ^1.39058 0 0 0 0 1 +particle dust 0.000 1.000 0.886 3.5 ^-4.40166 ^ ^0.9356 0 0 0 0 1 +particle dust 0.000 1.000 0.886 3.5 ^-4.47535 ^ ^0.47038 0 0 0 0 1 +particle dust 0.000 1.000 0.886 3.5 ^-4.5 ^ ^0 0 0 0 0 1 +particle dust 0.000 1.000 0.886 3.5 ^-4.47535 ^ ^-0.47038 0 0 0 0 1 +particle dust 0.000 1.000 0.886 3.5 ^-4.40166 ^ ^-0.9356 0 0 0 0 1 +particle dust 0.000 1.000 0.886 3.5 ^-4.27975 ^ ^-1.39058 0 0 0 0 1 +particle dust 0.000 1.000 0.886 3.5 ^-4.11095 ^ ^-1.83031 0 0 0 0 1 +particle dust 0.000 1.000 0.886 3.5 ^-3.89711 ^ ^-2.25 0 0 0 0 1 +particle dust 0.000 1.000 0.886 3.5 ^-3.64058 ^ ^-2.64503 0 0 0 0 1 +particle dust 0.000 1.000 0.886 3.5 ^-3.34415 ^ ^-3.01109 0 0 0 0 1 +particle dust 0.000 1.000 0.886 3.5 ^-3.01109 ^ ^-3.34415 0 0 0 0 1 +particle dust 0.000 1.000 0.886 3.5 ^-2.64503 ^ ^-3.64058 0 0 0 0 1 +particle dust 0.000 1.000 0.886 3.5 ^-2.25 ^ ^-3.89711 0 0 0 0 1 +particle dust 0.000 1.000 0.886 3.5 ^-1.83031 ^ ^-4.11095 0 0 0 0 1 +particle dust 0.000 1.000 0.886 3.5 ^-1.39058 ^ ^-4.27975 0 0 0 0 1 +particle dust 0.000 1.000 0.886 3.5 ^-0.9356 ^ ^-4.40166 0 0 0 0 1 +particle dust 0.000 1.000 0.886 3.5 ^-0.47038 ^ ^-4.47535 0 0 0 0 1 +# 円 2 +particle dust 0.000 0.906 0.906 3.5 ^0 ^ ^-4 0 0 0 0 1 +particle dust 0.000 0.906 0.906 3.5 ^0.48215 ^ ^-3.97084 0 0 0 0 1 +particle dust 0.000 0.906 0.906 3.5 ^0.95726 ^ ^-3.88377 0 0 0 0 1 +particle dust 0.000 0.906 0.906 3.5 ^1.41842 ^ ^-3.74006 0 0 0 0 1 +particle dust 0.000 0.906 0.906 3.5 ^1.85889 ^ ^-3.54182 0 0 0 0 1 +particle dust 0.000 0.906 0.906 3.5 ^2.27226 ^ ^-3.29194 0 0 0 0 1 +particle dust 0.000 0.906 0.906 3.5 ^2.65249 ^ ^-2.99404 0 0 0 0 1 +particle dust 0.000 0.906 0.906 3.5 ^2.99404 ^ ^-2.65249 0 0 0 0 1 +particle dust 0.000 0.906 0.906 3.5 ^3.29194 ^ ^-2.27226 0 0 0 0 1 +particle dust 0.000 0.906 0.906 3.5 ^3.54182 ^ ^-1.85889 0 0 0 0 1 +particle dust 0.000 0.906 0.906 3.5 ^3.74006 ^ ^-1.41842 0 0 0 0 1 +particle dust 0.000 0.906 0.906 3.5 ^3.88377 ^ ^-0.95726 0 0 0 0 1 +particle dust 0.000 0.906 0.906 3.5 ^3.97084 ^ ^-0.48215 0 0 0 0 1 +particle dust 0.000 0.906 0.906 3.5 ^4 ^ ^0 0 0 0 0 1 +particle dust 0.000 0.906 0.906 3.5 ^3.97084 ^ ^0.48215 0 0 0 0 1 +particle dust 0.000 0.906 0.906 3.5 ^3.88377 ^ ^0.95726 0 0 0 0 1 +particle dust 0.000 0.906 0.906 3.5 ^3.74006 ^ ^1.41842 0 0 0 0 1 +particle dust 0.000 0.906 0.906 3.5 ^3.54182 ^ ^1.85889 0 0 0 0 1 +particle dust 0.000 0.906 0.906 3.5 ^3.29194 ^ ^2.27226 0 0 0 0 1 +particle dust 0.000 0.906 0.906 3.5 ^2.99404 ^ ^2.65249 0 0 0 0 1 +particle dust 0.000 0.906 0.906 3.5 ^2.65249 ^ ^2.99404 0 0 0 0 1 +particle dust 0.000 0.906 0.906 3.5 ^2.27226 ^ ^3.29194 0 0 0 0 1 +particle dust 0.000 0.906 0.906 3.5 ^1.85889 ^ ^3.54182 0 0 0 0 1 +particle dust 0.000 0.906 0.906 3.5 ^1.41842 ^ ^3.74006 0 0 0 0 1 +particle dust 0.000 0.906 0.906 3.5 ^0.95726 ^ ^3.88377 0 0 0 0 1 +particle dust 0.000 0.906 0.906 3.5 ^0.48215 ^ ^3.97084 0 0 0 0 1 +particle dust 0.000 0.906 0.906 3.5 ^0 ^ ^4 0 0 0 0 1 +particle dust 0.000 0.906 0.906 3.5 ^-0.48215 ^ ^3.97084 0 0 0 0 1 +particle dust 0.000 0.906 0.906 3.5 ^-0.95726 ^ ^3.88377 0 0 0 0 1 +particle dust 0.000 0.906 0.906 3.5 ^-1.41842 ^ ^3.74006 0 0 0 0 1 +particle dust 0.000 0.906 0.906 3.5 ^-1.85889 ^ ^3.54182 0 0 0 0 1 +particle dust 0.000 0.906 0.906 3.5 ^-2.27226 ^ ^3.29194 0 0 0 0 1 +particle dust 0.000 0.906 0.906 3.5 ^-2.65249 ^ ^2.99404 0 0 0 0 1 +particle dust 0.000 0.906 0.906 3.5 ^-2.99404 ^ ^2.65249 0 0 0 0 1 +particle dust 0.000 0.906 0.906 3.5 ^-3.29194 ^ ^2.27226 0 0 0 0 1 +particle dust 0.000 0.906 0.906 3.5 ^-3.54182 ^ ^1.85889 0 0 0 0 1 +particle dust 0.000 0.906 0.906 3.5 ^-3.74006 ^ ^1.41842 0 0 0 0 1 +particle dust 0.000 0.906 0.906 3.5 ^-3.88377 ^ ^0.95726 0 0 0 0 1 +particle dust 0.000 0.906 0.906 3.5 ^-3.97084 ^ ^0.48215 0 0 0 0 1 +particle dust 0.000 0.906 0.906 3.5 ^-4 ^ ^0 0 0 0 0 1 +particle dust 0.000 0.906 0.906 3.5 ^-3.97084 ^ ^-0.48215 0 0 0 0 1 +particle dust 0.000 0.906 0.906 3.5 ^-3.88377 ^ ^-0.95726 0 0 0 0 1 +particle dust 0.000 0.906 0.906 3.5 ^-3.74006 ^ ^-1.41842 0 0 0 0 1 +particle dust 0.000 0.906 0.906 3.5 ^-3.54182 ^ ^-1.85889 0 0 0 0 1 +particle dust 0.000 0.906 0.906 3.5 ^-3.29194 ^ ^-2.27226 0 0 0 0 1 +particle dust 0.000 0.906 0.906 3.5 ^-2.99404 ^ ^-2.65249 0 0 0 0 1 +particle dust 0.000 0.906 0.906 3.5 ^-2.65249 ^ ^-2.99404 0 0 0 0 1 +particle dust 0.000 0.906 0.906 3.5 ^-2.27226 ^ ^-3.29194 0 0 0 0 1 +particle dust 0.000 0.906 0.906 3.5 ^-1.85889 ^ ^-3.54182 0 0 0 0 1 +particle dust 0.000 0.906 0.906 3.5 ^-1.41842 ^ ^-3.74006 0 0 0 0 1 +particle dust 0.000 0.906 0.906 3.5 ^-0.95726 ^ ^-3.88377 0 0 0 0 1 +particle dust 0.000 0.906 0.906 3.5 ^-0.48215 ^ ^-3.97084 0 0 0 0 1 +# 円 3 +particle dust 0.000 0.816 0.929 3.5 ^0 ^ ^-3.5 0 0 0 0 1 +particle dust 0.000 0.816 0.929 3.5 ^0.45684 ^ ^-3.47006 0 0 0 0 1 +particle dust 0.000 0.816 0.929 3.5 ^0.90587 ^ ^-3.38074 0 0 0 0 1 +particle dust 0.000 0.816 0.929 3.5 ^1.33939 ^ ^-3.23358 0 0 0 0 1 +particle dust 0.000 0.816 0.929 3.5 ^1.75 ^ ^-3.03109 0 0 0 0 1 +particle dust 0.000 0.816 0.929 3.5 ^2.13067 ^ ^-2.77674 0 0 0 0 1 +particle dust 0.000 0.816 0.929 3.5 ^2.47487 ^ ^-2.47487 0 0 0 0 1 +particle dust 0.000 0.816 0.929 3.5 ^2.77674 ^ ^-2.13067 0 0 0 0 1 +particle dust 0.000 0.816 0.929 3.5 ^3.03109 ^ ^-1.75 0 0 0 0 1 +particle dust 0.000 0.816 0.929 3.5 ^3.23358 ^ ^-1.33939 0 0 0 0 1 +particle dust 0.000 0.816 0.929 3.5 ^3.38074 ^ ^-0.90587 0 0 0 0 1 +particle dust 0.000 0.816 0.929 3.5 ^3.47006 ^ ^-0.45684 0 0 0 0 1 +particle dust 0.000 0.816 0.929 3.5 ^3.5 ^ ^0 0 0 0 0 1 +particle dust 0.000 0.816 0.929 3.5 ^3.47006 ^ ^0.45684 0 0 0 0 1 +particle dust 0.000 0.816 0.929 3.5 ^3.38074 ^ ^0.90587 0 0 0 0 1 +particle dust 0.000 0.816 0.929 3.5 ^3.23358 ^ ^1.33939 0 0 0 0 1 +particle dust 0.000 0.816 0.929 3.5 ^3.03109 ^ ^1.75 0 0 0 0 1 +particle dust 0.000 0.816 0.929 3.5 ^2.77674 ^ ^2.13067 0 0 0 0 1 +particle dust 0.000 0.816 0.929 3.5 ^2.47487 ^ ^2.47487 0 0 0 0 1 +particle dust 0.000 0.816 0.929 3.5 ^2.13067 ^ ^2.77674 0 0 0 0 1 +particle dust 0.000 0.816 0.929 3.5 ^1.75 ^ ^3.03109 0 0 0 0 1 +particle dust 0.000 0.816 0.929 3.5 ^1.33939 ^ ^3.23358 0 0 0 0 1 +particle dust 0.000 0.816 0.929 3.5 ^0.90587 ^ ^3.38074 0 0 0 0 1 +particle dust 0.000 0.816 0.929 3.5 ^0.45684 ^ ^3.47006 0 0 0 0 1 +particle dust 0.000 0.816 0.929 3.5 ^0 ^ ^3.5 0 0 0 0 1 +particle dust 0.000 0.816 0.929 3.5 ^-0.45684 ^ ^3.47006 0 0 0 0 1 +particle dust 0.000 0.816 0.929 3.5 ^-0.90587 ^ ^3.38074 0 0 0 0 1 +particle dust 0.000 0.816 0.929 3.5 ^-1.33939 ^ ^3.23358 0 0 0 0 1 +particle dust 0.000 0.816 0.929 3.5 ^-1.75 ^ ^3.03109 0 0 0 0 1 +particle dust 0.000 0.816 0.929 3.5 ^-2.13067 ^ ^2.77674 0 0 0 0 1 +particle dust 0.000 0.816 0.929 3.5 ^-2.47487 ^ ^2.47487 0 0 0 0 1 +particle dust 0.000 0.816 0.929 3.5 ^-2.77674 ^ ^2.13067 0 0 0 0 1 +particle dust 0.000 0.816 0.929 3.5 ^-3.03109 ^ ^1.75 0 0 0 0 1 +particle dust 0.000 0.816 0.929 3.5 ^-3.23358 ^ ^1.33939 0 0 0 0 1 +particle dust 0.000 0.816 0.929 3.5 ^-3.38074 ^ ^0.90587 0 0 0 0 1 +particle dust 0.000 0.816 0.929 3.5 ^-3.47006 ^ ^0.45684 0 0 0 0 1 +particle dust 0.000 0.816 0.929 3.5 ^-3.5 ^ ^0 0 0 0 0 1 +particle dust 0.000 0.816 0.929 3.5 ^-3.47006 ^ ^-0.45684 0 0 0 0 1 +particle dust 0.000 0.816 0.929 3.5 ^-3.38074 ^ ^-0.90587 0 0 0 0 1 +particle dust 0.000 0.816 0.929 3.5 ^-3.23358 ^ ^-1.33939 0 0 0 0 1 +particle dust 0.000 0.816 0.929 3.5 ^-3.03109 ^ ^-1.75 0 0 0 0 1 +particle dust 0.000 0.816 0.929 3.5 ^-2.77674 ^ ^-2.13067 0 0 0 0 1 +particle dust 0.000 0.816 0.929 3.5 ^-2.47487 ^ ^-2.47487 0 0 0 0 1 +particle dust 0.000 0.816 0.929 3.5 ^-2.13067 ^ ^-2.77674 0 0 0 0 1 +particle dust 0.000 0.816 0.929 3.5 ^-1.75 ^ ^-3.03109 0 0 0 0 1 +particle dust 0.000 0.816 0.929 3.5 ^-1.33939 ^ ^-3.23358 0 0 0 0 1 +particle dust 0.000 0.816 0.929 3.5 ^-0.90587 ^ ^-3.38074 0 0 0 0 1 +particle dust 0.000 0.816 0.929 3.5 ^-0.45684 ^ ^-3.47006 0 0 0 0 1 +# 円 4 +particle dust 0.000 0.725 0.953 3.5 ^0 ^ ^-3 0 0 0 0 1 +particle dust 0.000 0.725 0.953 3.5 ^0.42694 ^ ^-2.96946 0 0 0 0 1 +particle dust 0.000 0.725 0.953 3.5 ^0.8452 ^ ^-2.87848 0 0 0 0 1 +particle dust 0.000 0.725 0.953 3.5 ^1.24625 ^ ^-2.7289 0 0 0 0 1 +particle dust 0.000 0.725 0.953 3.5 ^1.62192 ^ ^-2.52376 0 0 0 0 1 +particle dust 0.000 0.725 0.953 3.5 ^1.96458 ^ ^-2.26725 0 0 0 0 1 +particle dust 0.000 0.725 0.953 3.5 ^2.26725 ^ ^-1.96458 0 0 0 0 1 +particle dust 0.000 0.725 0.953 3.5 ^2.52376 ^ ^-1.62192 0 0 0 0 1 +particle dust 0.000 0.725 0.953 3.5 ^2.7289 ^ ^-1.24625 0 0 0 0 1 +particle dust 0.000 0.725 0.953 3.5 ^2.87848 ^ ^-0.8452 0 0 0 0 1 +particle dust 0.000 0.725 0.953 3.5 ^2.96946 ^ ^-0.42694 0 0 0 0 1 +particle dust 0.000 0.725 0.953 3.5 ^3 ^ ^0 0 0 0 0 1 +particle dust 0.000 0.725 0.953 3.5 ^2.96946 ^ ^0.42694 0 0 0 0 1 +particle dust 0.000 0.725 0.953 3.5 ^2.87848 ^ ^0.8452 0 0 0 0 1 +particle dust 0.000 0.725 0.953 3.5 ^2.7289 ^ ^1.24625 0 0 0 0 1 +particle dust 0.000 0.725 0.953 3.5 ^2.52376 ^ ^1.62192 0 0 0 0 1 +particle dust 0.000 0.725 0.953 3.5 ^2.26725 ^ ^1.96458 0 0 0 0 1 +particle dust 0.000 0.725 0.953 3.5 ^1.96458 ^ ^2.26725 0 0 0 0 1 +particle dust 0.000 0.725 0.953 3.5 ^1.62192 ^ ^2.52376 0 0 0 0 1 +particle dust 0.000 0.725 0.953 3.5 ^1.24625 ^ ^2.7289 0 0 0 0 1 +particle dust 0.000 0.725 0.953 3.5 ^0.8452 ^ ^2.87848 0 0 0 0 1 +particle dust 0.000 0.725 0.953 3.5 ^0.42694 ^ ^2.96946 0 0 0 0 1 +particle dust 0.000 0.725 0.953 3.5 ^0 ^ ^3 0 0 0 0 1 +particle dust 0.000 0.725 0.953 3.5 ^-0.42694 ^ ^2.96946 0 0 0 0 1 +particle dust 0.000 0.725 0.953 3.5 ^-0.8452 ^ ^2.87848 0 0 0 0 1 +particle dust 0.000 0.725 0.953 3.5 ^-1.24625 ^ ^2.7289 0 0 0 0 1 +particle dust 0.000 0.725 0.953 3.5 ^-1.62192 ^ ^2.52376 0 0 0 0 1 +particle dust 0.000 0.725 0.953 3.5 ^-1.96458 ^ ^2.26725 0 0 0 0 1 +particle dust 0.000 0.725 0.953 3.5 ^-2.26725 ^ ^1.96458 0 0 0 0 1 +particle dust 0.000 0.725 0.953 3.5 ^-2.52376 ^ ^1.62192 0 0 0 0 1 +particle dust 0.000 0.725 0.953 3.5 ^-2.7289 ^ ^1.24625 0 0 0 0 1 +particle dust 0.000 0.725 0.953 3.5 ^-2.87848 ^ ^0.8452 0 0 0 0 1 +particle dust 0.000 0.725 0.953 3.5 ^-2.96946 ^ ^0.42694 0 0 0 0 1 +particle dust 0.000 0.725 0.953 3.5 ^-3 ^ ^0 0 0 0 0 1 +particle dust 0.000 0.725 0.953 3.5 ^-2.96946 ^ ^-0.42694 0 0 0 0 1 +particle dust 0.000 0.725 0.953 3.5 ^-2.87848 ^ ^-0.8452 0 0 0 0 1 +particle dust 0.000 0.725 0.953 3.5 ^-2.7289 ^ ^-1.24625 0 0 0 0 1 +particle dust 0.000 0.725 0.953 3.5 ^-2.52376 ^ ^-1.62192 0 0 0 0 1 +particle dust 0.000 0.725 0.953 3.5 ^-2.26725 ^ ^-1.96458 0 0 0 0 1 +particle dust 0.000 0.725 0.953 3.5 ^-1.96458 ^ ^-2.26725 0 0 0 0 1 +particle dust 0.000 0.725 0.953 3.5 ^-1.62192 ^ ^-2.52376 0 0 0 0 1 +particle dust 0.000 0.725 0.953 3.5 ^-1.24625 ^ ^-2.7289 0 0 0 0 1 +particle dust 0.000 0.725 0.953 3.5 ^-0.8452 ^ ^-2.87848 0 0 0 0 1 +particle dust 0.000 0.725 0.953 3.5 ^-0.42694 ^ ^-2.96946 0 0 0 0 1 +# 円 5 +particle dust 0.000 0.635 0.976 3.5 ^0 ^ ^-2.5 0 0 0 0 1 +particle dust 0.000 0.635 0.976 3.5 ^0.39109 ^ ^-2.46922 0 0 0 0 1 +particle dust 0.000 0.635 0.976 3.5 ^0.77254 ^ ^-2.37764 0 0 0 0 1 +particle dust 0.000 0.635 0.976 3.5 ^1.13498 ^ ^-2.22752 0 0 0 0 1 +particle dust 0.000 0.635 0.976 3.5 ^1.46946 ^ ^-2.02254 0 0 0 0 1 +particle dust 0.000 0.635 0.976 3.5 ^1.76777 ^ ^-1.76777 0 0 0 0 1 +particle dust 0.000 0.635 0.976 3.5 ^2.02254 ^ ^-1.46946 0 0 0 0 1 +particle dust 0.000 0.635 0.976 3.5 ^2.22752 ^ ^-1.13498 0 0 0 0 1 +particle dust 0.000 0.635 0.976 3.5 ^2.37764 ^ ^-0.77254 0 0 0 0 1 +particle dust 0.000 0.635 0.976 3.5 ^2.46922 ^ ^-0.39109 0 0 0 0 1 +particle dust 0.000 0.635 0.976 3.5 ^2.5 ^ ^0 0 0 0 0 1 +particle dust 0.000 0.635 0.976 3.5 ^2.46922 ^ ^0.39109 0 0 0 0 1 +particle dust 0.000 0.635 0.976 3.5 ^2.37764 ^ ^0.77254 0 0 0 0 1 +particle dust 0.000 0.635 0.976 3.5 ^2.22752 ^ ^1.13498 0 0 0 0 1 +particle dust 0.000 0.635 0.976 3.5 ^2.02254 ^ ^1.46946 0 0 0 0 1 +particle dust 0.000 0.635 0.976 3.5 ^1.76777 ^ ^1.76777 0 0 0 0 1 +particle dust 0.000 0.635 0.976 3.5 ^1.46946 ^ ^2.02254 0 0 0 0 1 +particle dust 0.000 0.635 0.976 3.5 ^1.13498 ^ ^2.22752 0 0 0 0 1 +particle dust 0.000 0.635 0.976 3.5 ^0.77254 ^ ^2.37764 0 0 0 0 1 +particle dust 0.000 0.635 0.976 3.5 ^0.39109 ^ ^2.46922 0 0 0 0 1 +particle dust 0.000 0.635 0.976 3.5 ^0 ^ ^2.5 0 0 0 0 1 +particle dust 0.000 0.635 0.976 3.5 ^-0.39109 ^ ^2.46922 0 0 0 0 1 +particle dust 0.000 0.635 0.976 3.5 ^-0.77254 ^ ^2.37764 0 0 0 0 1 +particle dust 0.000 0.635 0.976 3.5 ^-1.13498 ^ ^2.22752 0 0 0 0 1 +particle dust 0.000 0.635 0.976 3.5 ^-1.46946 ^ ^2.02254 0 0 0 0 1 +particle dust 0.000 0.635 0.976 3.5 ^-1.76777 ^ ^1.76777 0 0 0 0 1 +particle dust 0.000 0.635 0.976 3.5 ^-2.02254 ^ ^1.46946 0 0 0 0 1 +particle dust 0.000 0.635 0.976 3.5 ^-2.22752 ^ ^1.13498 0 0 0 0 1 +particle dust 0.000 0.635 0.976 3.5 ^-2.37764 ^ ^0.77254 0 0 0 0 1 +particle dust 0.000 0.635 0.976 3.5 ^-2.46922 ^ ^0.39109 0 0 0 0 1 +particle dust 0.000 0.635 0.976 3.5 ^-2.5 ^ ^0 0 0 0 0 1 +particle dust 0.000 0.635 0.976 3.5 ^-2.46922 ^ ^-0.39109 0 0 0 0 1 +particle dust 0.000 0.635 0.976 3.5 ^-2.37764 ^ ^-0.77254 0 0 0 0 1 +particle dust 0.000 0.635 0.976 3.5 ^-2.22752 ^ ^-1.13498 0 0 0 0 1 +particle dust 0.000 0.635 0.976 3.5 ^-2.02254 ^ ^-1.46946 0 0 0 0 1 +particle dust 0.000 0.635 0.976 3.5 ^-1.76777 ^ ^-1.76777 0 0 0 0 1 +particle dust 0.000 0.635 0.976 3.5 ^-1.46946 ^ ^-2.02254 0 0 0 0 1 +particle dust 0.000 0.635 0.976 3.5 ^-1.13498 ^ ^-2.22752 0 0 0 0 1 +particle dust 0.000 0.635 0.976 3.5 ^-0.77254 ^ ^-2.37764 0 0 0 0 1 +particle dust 0.000 0.635 0.976 3.5 ^-0.39109 ^ ^-2.46922 0 0 0 0 1 +# 円 6 +particle dust 0.000 0.545 1.000 3.5 ^0 ^ ^-2 0 0 0 0 1 +particle dust 0.000 0.545 1.000 3.5 ^0.3473 ^ ^-1.96962 0 0 0 0 1 +particle dust 0.000 0.545 1.000 3.5 ^0.68404 ^ ^-1.87939 0 0 0 0 1 +particle dust 0.000 0.545 1.000 3.5 ^1 ^ ^-1.73205 0 0 0 0 1 +particle dust 0.000 0.545 1.000 3.5 ^1.28558 ^ ^-1.53209 0 0 0 0 1 +particle dust 0.000 0.545 1.000 3.5 ^1.53209 ^ ^-1.28558 0 0 0 0 1 +particle dust 0.000 0.545 1.000 3.5 ^1.73205 ^ ^-1 0 0 0 0 1 +particle dust 0.000 0.545 1.000 3.5 ^1.87939 ^ ^-0.68404 0 0 0 0 1 +particle dust 0.000 0.545 1.000 3.5 ^1.96962 ^ ^-0.3473 0 0 0 0 1 +particle dust 0.000 0.545 1.000 3.5 ^2 ^ ^0 0 0 0 0 1 +particle dust 0.000 0.545 1.000 3.5 ^1.96962 ^ ^0.3473 0 0 0 0 1 +particle dust 0.000 0.545 1.000 3.5 ^1.87939 ^ ^0.68404 0 0 0 0 1 +particle dust 0.000 0.545 1.000 3.5 ^1.73205 ^ ^1 0 0 0 0 1 +particle dust 0.000 0.545 1.000 3.5 ^1.53209 ^ ^1.28558 0 0 0 0 1 +particle dust 0.000 0.545 1.000 3.5 ^1.28558 ^ ^1.53209 0 0 0 0 1 +particle dust 0.000 0.545 1.000 3.5 ^1 ^ ^1.73205 0 0 0 0 1 +particle dust 0.000 0.545 1.000 3.5 ^0.68404 ^ ^1.87939 0 0 0 0 1 +particle dust 0.000 0.545 1.000 3.5 ^0.3473 ^ ^1.96962 0 0 0 0 1 +particle dust 0.000 0.545 1.000 3.5 ^0 ^ ^2 0 0 0 0 1 +particle dust 0.000 0.545 1.000 3.5 ^-0.3473 ^ ^1.96962 0 0 0 0 1 +particle dust 0.000 0.545 1.000 3.5 ^-0.68404 ^ ^1.87939 0 0 0 0 1 +particle dust 0.000 0.545 1.000 3.5 ^-1 ^ ^1.73205 0 0 0 0 1 +particle dust 0.000 0.545 1.000 3.5 ^-1.28558 ^ ^1.53209 0 0 0 0 1 +particle dust 0.000 0.545 1.000 3.5 ^-1.53209 ^ ^1.28558 0 0 0 0 1 +particle dust 0.000 0.545 1.000 3.5 ^-1.73205 ^ ^1 0 0 0 0 1 +particle dust 0.000 0.545 1.000 3.5 ^-1.87939 ^ ^0.68404 0 0 0 0 1 +particle dust 0.000 0.545 1.000 3.5 ^-1.96962 ^ ^0.3473 0 0 0 0 1 +particle dust 0.000 0.545 1.000 3.5 ^-2 ^ ^0 0 0 0 0 1 +particle dust 0.000 0.545 1.000 3.5 ^-1.96962 ^ ^-0.3473 0 0 0 0 1 +particle dust 0.000 0.545 1.000 3.5 ^-1.87939 ^ ^-0.68404 0 0 0 0 1 +particle dust 0.000 0.545 1.000 3.5 ^-1.73205 ^ ^-1 0 0 0 0 1 +particle dust 0.000 0.545 1.000 3.5 ^-1.53209 ^ ^-1.28558 0 0 0 0 1 +particle dust 0.000 0.545 1.000 3.5 ^-1.28558 ^ ^-1.53209 0 0 0 0 1 +particle dust 0.000 0.545 1.000 3.5 ^-1 ^ ^-1.73205 0 0 0 0 1 +particle dust 0.000 0.545 1.000 3.5 ^-0.68404 ^ ^-1.87939 0 0 0 0 1 +particle dust 0.000 0.545 1.000 3.5 ^-0.3473 ^ ^-1.96962 0 0 0 0 1 diff --git a/Asset/data/asset/functions/effect/0244.aurora_armor/given/.mcfunction b/Asset/data/asset/functions/effect/0244.aurora_armor/given/.mcfunction new file mode 100644 index 0000000000..b390c648d8 --- /dev/null +++ b/Asset/data/asset/functions/effect/0244.aurora_armor/given/.mcfunction @@ -0,0 +1,11 @@ +#> asset:effect/0244.aurora_armor/given/ +# +# Effectが付与された時の処理 +# +# @within function asset:effect/0244.aurora_armor/_/given + +# フルセット効果を付与 + execute if data storage asset:context {Stack:4} run function asset:effect/0244.aurora_armor/fullset/equip + +# スタックを記録 + data modify storage asset:context this.PrevStack set from storage asset:context Stack diff --git a/Asset/data/asset/functions/effect/0244.aurora_armor/re-given/.mcfunction b/Asset/data/asset/functions/effect/0244.aurora_armor/re-given/.mcfunction new file mode 100644 index 0000000000..4829d7fc68 --- /dev/null +++ b/Asset/data/asset/functions/effect/0244.aurora_armor/re-given/.mcfunction @@ -0,0 +1,14 @@ +#> asset:effect/0244.aurora_armor/re-given/ +# +# Effectが上書きされた時の処理 +# +# @within function asset:effect/0244.aurora_armor/_/re-given + +# フルセット効果を削除 + execute if data storage asset:context PreviousField{PrevStack:4} unless data storage asset:context {Stack:4} run function asset:effect/0244.aurora_armor/fullset/dis_equip + +# フルセット効果を付与 + execute unless data storage asset:context PreviousField{PrevStack:4} if data storage asset:context {Stack:4} run function asset:effect/0244.aurora_armor/fullset/equip + +# スタックを記録 + data modify storage asset:context this.PrevStack set from storage asset:context Stack diff --git a/Asset/data/asset/functions/effect/0244.aurora_armor/register.mcfunction b/Asset/data/asset/functions/effect/0244.aurora_armor/register.mcfunction new file mode 100644 index 0000000000..6ee7704a67 --- /dev/null +++ b/Asset/data/asset/functions/effect/0244.aurora_armor/register.mcfunction @@ -0,0 +1,32 @@ +#> asset:effect/0244.aurora_armor/register +# +# Effectのデータを指定 +# +# @within function asset:effect/0244.aurora_armor/_/register + +# ExtendsSafe (boolean) (default = false) + # data modify storage asset:effect ExtendsSafe set value true +# ID (int) + data modify storage asset:effect ID set value 244 +# 名前 (TextComponentString) + data modify storage asset:effect Name set value '[{"text":"オー","color":"#00FFE2"},{"text":"ロラ","color":"#00CEDD"},{"text":"アー","color":"#00ACF6"},{"text":"マー","color":"#008BFF"}]' +# 説明文 (TextComponentString[]) + data modify storage asset:effect Description set value ['{"text":"雷攻撃 +10%","color":"green"}','{"text":"MP回復量 +10%","color":"green"}'] +# 効果時間 (int) (default = API || error) + data modify storage asset:effect Duration set value 2147483647 +# スタック (int) (default = API || 1) + # data modify storage asset:effect Stack set value +# 効果時間の操作方法 (default = API || "replace") + # data modify storage asset:effect DurationOperation set value +# スタックの操作方法 (default = API || "replace") + data modify storage asset:effect StackOperation set value "forceReplace" +# 最大効果時間 (int) (default = 2147483647) + # data modify storage asset:effect MaxDuration set value +# 最大スタック (int) (default = 2147483647) + data modify storage asset:effect MaxStack set value 4 +# 悪い効果か否か (boolean) + data modify storage asset:effect IsBadEffect set value false +# 死亡時のエフェクトの処理 (default = "remove") + # data modify storage asset:effect ProcessOnDied set value +# 消すのに必要なレベル (int) (default = 1) + data modify storage asset:effect RequireClearLv set value 4 diff --git a/Asset/data/asset/functions/effect/0244.aurora_armor/remove/.mcfunction b/Asset/data/asset/functions/effect/0244.aurora_armor/remove/.mcfunction new file mode 100644 index 0000000000..b5dc92657c --- /dev/null +++ b/Asset/data/asset/functions/effect/0244.aurora_armor/remove/.mcfunction @@ -0,0 +1,8 @@ +#> asset:effect/0244.aurora_armor/remove/ +# +# Effectが削除された時の処理 +# +# @within function asset:effect/0244.aurora_armor/_/remove + +# フルセット効果を削除 + execute if data storage asset:context {Stack:4} run function asset:effect/0244.aurora_armor/fullset/dis_equip diff --git a/Asset/data/asset/functions/effect/0244.aurora_armor/tick/.mcfunction b/Asset/data/asset/functions/effect/0244.aurora_armor/tick/.mcfunction new file mode 100644 index 0000000000..e53ee5f8c6 --- /dev/null +++ b/Asset/data/asset/functions/effect/0244.aurora_armor/tick/.mcfunction @@ -0,0 +1,8 @@ +#> asset:effect/0244.aurora_armor/tick/ +# +# Effectのtick処理 +# +# @within function asset:effect/0244.aurora_armor/_/tick + +# 演出 + execute if data storage asset:context {Stack:4} run function asset:effect/0244.aurora_armor/fullset/passive diff --git a/Asset/data/asset/functions/effect/0245.flame_hunter_attire/_/given.mcfunction b/Asset/data/asset/functions/effect/0245.flame_hunter_attire/_/given.mcfunction new file mode 100644 index 0000000000..0644aed932 --- /dev/null +++ b/Asset/data/asset/functions/effect/0245.flame_hunter_attire/_/given.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0245.flame_hunter_attire/_/given +# +# Effectが付与された時に実行されるfunction +# +# @within tag/function asset:effect/given + +execute if data storage asset:context {id:245} run function asset:effect/0245.flame_hunter_attire/given/ \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0245.flame_hunter_attire/_/re-given.mcfunction b/Asset/data/asset/functions/effect/0245.flame_hunter_attire/_/re-given.mcfunction new file mode 100644 index 0000000000..b80eac1a8e --- /dev/null +++ b/Asset/data/asset/functions/effect/0245.flame_hunter_attire/_/re-given.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0245.flame_hunter_attire/_/re-given +# +# Effectが上書きされた時に実行されるfunction +# +# @within tag/function asset:effect/re-given + +execute if data storage asset:context {id:245} run function asset:effect/0245.flame_hunter_attire/re-given/ \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0245.flame_hunter_attire/_/register.mcfunction b/Asset/data/asset/functions/effect/0245.flame_hunter_attire/_/register.mcfunction new file mode 100644 index 0000000000..b65383ddb5 --- /dev/null +++ b/Asset/data/asset/functions/effect/0245.flame_hunter_attire/_/register.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0245.flame_hunter_attire/_/register +# +# +# +# @within tag/function asset:effect/register + +execute if data storage asset:context {id:245} run function asset:effect/0245.flame_hunter_attire/register \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0245.flame_hunter_attire/_/remove.mcfunction b/Asset/data/asset/functions/effect/0245.flame_hunter_attire/_/remove.mcfunction new file mode 100644 index 0000000000..82fa62809a --- /dev/null +++ b/Asset/data/asset/functions/effect/0245.flame_hunter_attire/_/remove.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0245.flame_hunter_attire/_/remove +# +# Effectが神器や牛乳によって削除された時に実行されるfunction +# +# @within tag/function asset:effect/remove + +execute if data storage asset:context {id:245} run function asset:effect/0245.flame_hunter_attire/remove/ \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0245.flame_hunter_attire/fullset/dis_equip.mcfunction b/Asset/data/asset/functions/effect/0245.flame_hunter_attire/fullset/dis_equip.mcfunction new file mode 100644 index 0000000000..bb841ced61 --- /dev/null +++ b/Asset/data/asset/functions/effect/0245.flame_hunter_attire/fullset/dis_equip.mcfunction @@ -0,0 +1,21 @@ +#> asset:effect/0245.flame_hunter_attire/fullset/dis_equip +# @within function +# asset:effect/0245.flame_hunter_attire/re-given/ +# asset:effect/0245.flame_hunter_attire/remove/ + +# 演出 + particle smoke ~ ~1.2 ~ 0.4 0.4 0.4 0.05 80 normal @a + particle ash ~ ~1.2 ~ 0.4 0.4 0.4 0.2 200 normal @a + playsound block.fire.extinguish player @a ~ ~ ~ 0.4 0.7 + +# 補正 + # 火攻撃+10% + data modify storage api: Argument.UUID set value [I;1,3,245,0] + function api:modifier/attack/fire/remove + + # 火耐性+10% + data modify storage api: Argument.UUID set value [I;1,3,245,0] + function api:modifier/defense/fire/remove + + # 移動速度+10% + attribute @s generic.movement_speed modifier remove 1-0-3-0-f500000000 diff --git a/Asset/data/asset/functions/effect/0245.flame_hunter_attire/fullset/equip.mcfunction b/Asset/data/asset/functions/effect/0245.flame_hunter_attire/fullset/equip.mcfunction new file mode 100644 index 0000000000..5c4b1ddf6c --- /dev/null +++ b/Asset/data/asset/functions/effect/0245.flame_hunter_attire/fullset/equip.mcfunction @@ -0,0 +1,25 @@ +#> asset:effect/0245.flame_hunter_attire/fullset/equip +# @within function asset:effect/0245.flame_hunter_attire/*given/ + +# 演出 + particle lava ~ ~1.2 ~ 0.8 0.4 0.8 0 30 normal @a + particle block azalea ~ ~1.7 ~ 0.3 0.2 0.3 0 60 normal @a + playsound block.grass.break player @a ~ ~ ~ 0.4 1.2 0 + playsound block.grass.break player @a ~ ~ ~ 0.4 1.4 0 + playsound block.fire.ambient player @a ~ ~ ~ 0.8 1 0 + +# 補正 + # 火攻撃+10% + data modify storage api: Argument.UUID set value [I;1,3,245,0] + data modify storage api: Argument.Amount set value 0.1 + data modify storage api: Argument.Operation set value "multiply_base" + function api:modifier/attack/fire/add + + # 火耐性+10% + data modify storage api: Argument.UUID set value [I;1,3,245,0] + data modify storage api: Argument.Amount set value 0.1 + data modify storage api: Argument.Operation set value "multiply_base" + function api:modifier/defense/fire/add + + # 移動速度+10% + attribute @s generic.movement_speed modifier add 1-0-3-0-f500000000 "245.FullsetSpeed" 0.1 multiply_base diff --git a/Asset/data/asset/functions/effect/0245.flame_hunter_attire/given/.mcfunction b/Asset/data/asset/functions/effect/0245.flame_hunter_attire/given/.mcfunction new file mode 100644 index 0000000000..c0e7d6c3c4 --- /dev/null +++ b/Asset/data/asset/functions/effect/0245.flame_hunter_attire/given/.mcfunction @@ -0,0 +1,11 @@ +#> asset:effect/0245.flame_hunter_attire/given/ +# +# Effectが付与された時の処理 +# +# @within function asset:effect/0245.flame_hunter_attire/_/given + +# フルセット効果を付与 + execute if data storage asset:context {Stack:4} run function asset:effect/0245.flame_hunter_attire/fullset/equip + +# スタックを記録 + data modify storage asset:context this.PrevStack set from storage asset:context Stack diff --git a/Asset/data/asset/functions/effect/0245.flame_hunter_attire/re-given/.mcfunction b/Asset/data/asset/functions/effect/0245.flame_hunter_attire/re-given/.mcfunction new file mode 100644 index 0000000000..b66fd6a282 --- /dev/null +++ b/Asset/data/asset/functions/effect/0245.flame_hunter_attire/re-given/.mcfunction @@ -0,0 +1,14 @@ +#> asset:effect/0245.flame_hunter_attire/re-given/ +# +# Effectが上書きされた時の処理 +# +# @within function asset:effect/0245.flame_hunter_attire/_/re-given + +# フルセット効果を削除 + execute if data storage asset:context PreviousField{PrevStack:4} unless data storage asset:context {Stack:4} run function asset:effect/0245.flame_hunter_attire/fullset/dis_equip + +# フルセット効果を付与 + execute unless data storage asset:context PreviousField{PrevStack:4} if data storage asset:context {Stack:4} run function asset:effect/0245.flame_hunter_attire/fullset/equip + +# スタックを記録 + data modify storage asset:context this.PrevStack set from storage asset:context Stack diff --git a/Asset/data/asset/functions/effect/0245.flame_hunter_attire/register.mcfunction b/Asset/data/asset/functions/effect/0245.flame_hunter_attire/register.mcfunction new file mode 100644 index 0000000000..1164881bb3 --- /dev/null +++ b/Asset/data/asset/functions/effect/0245.flame_hunter_attire/register.mcfunction @@ -0,0 +1,32 @@ +#> asset:effect/0245.flame_hunter_attire/register +# +# Effectのデータを指定 +# +# @within function asset:effect/0245.flame_hunter_attire/_/register + +# ExtendsSafe (boolean) (default = false) + # data modify storage asset:effect ExtendsSafe set value true +# ID (int) + data modify storage asset:effect ID set value 245 +# 名前 (TextComponentString) + data modify storage asset:effect Name set value '{"text":"炎を追う狩人の装束","color":"#C92A2A"}' +# 説明文 (TextComponentString[]) + data modify storage asset:effect Description set value ['{"text":"火攻撃 +5%","color":"green"}','{"text":"火耐性 +5%","color":"green"}','{"text":"移動速度 +10%","color":"green"}'] +# 効果時間 (int) (default = API || error) + data modify storage asset:effect Duration set value 2147483647 +# スタック (int) (default = API || 1) + # data modify storage asset:effect Stack set value +# 効果時間の操作方法 (default = API || "replace") + # data modify storage asset:effect DurationOperation set value +# スタックの操作方法 (default = API || "replace") + data modify storage asset:effect StackOperation set value "forceReplace" +# 最大効果時間 (int) (default = 2147483647) + # data modify storage asset:effect MaxDuration set value +# 最大スタック (int) (default = 2147483647) + data modify storage asset:effect MaxStack set value 4 +# 悪い効果か否か (boolean) + data modify storage asset:effect IsBadEffect set value false +# 死亡時のエフェクトの処理 (default = "remove") + # data modify storage asset:effect ProcessOnDied set value +# 消すのに必要なレベル (int) (default = 1) + data modify storage asset:effect RequireClearLv set value 4 diff --git a/Asset/data/asset/functions/effect/0245.flame_hunter_attire/remove/.mcfunction b/Asset/data/asset/functions/effect/0245.flame_hunter_attire/remove/.mcfunction new file mode 100644 index 0000000000..ac207d2611 --- /dev/null +++ b/Asset/data/asset/functions/effect/0245.flame_hunter_attire/remove/.mcfunction @@ -0,0 +1,8 @@ +#> asset:effect/0245.flame_hunter_attire/remove/ +# +# Effectが削除された時の処理 +# +# @within function asset:effect/0245.flame_hunter_attire/_/remove + +# フルセット効果を削除 + execute if data storage asset:context {Stack:4} run function asset:effect/0245.flame_hunter_attire/fullset/dis_equip diff --git a/Asset/data/asset/functions/effect/0246.flame_devil_armor/_/given.mcfunction b/Asset/data/asset/functions/effect/0246.flame_devil_armor/_/given.mcfunction new file mode 100644 index 0000000000..5a6799adbd --- /dev/null +++ b/Asset/data/asset/functions/effect/0246.flame_devil_armor/_/given.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0246.flame_devil_armor/_/given +# +# Effectが付与された時に実行されるfunction +# +# @within tag/function asset:effect/given + +execute if data storage asset:context {id:246} run function asset:effect/0246.flame_devil_armor/given/ \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0246.flame_devil_armor/_/re-given.mcfunction b/Asset/data/asset/functions/effect/0246.flame_devil_armor/_/re-given.mcfunction new file mode 100644 index 0000000000..1dcefde132 --- /dev/null +++ b/Asset/data/asset/functions/effect/0246.flame_devil_armor/_/re-given.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0246.flame_devil_armor/_/re-given +# +# Effectが上書きされた時に実行されるfunction +# +# @within tag/function asset:effect/re-given + +execute if data storage asset:context {id:246} run function asset:effect/0246.flame_devil_armor/re-given/ \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0246.flame_devil_armor/_/register.mcfunction b/Asset/data/asset/functions/effect/0246.flame_devil_armor/_/register.mcfunction new file mode 100644 index 0000000000..ad1417cb4b --- /dev/null +++ b/Asset/data/asset/functions/effect/0246.flame_devil_armor/_/register.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0246.flame_devil_armor/_/register +# +# +# +# @within tag/function asset:effect/register + +execute if data storage asset:context {id:246} run function asset:effect/0246.flame_devil_armor/register \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0246.flame_devil_armor/fullset/equip.mcfunction b/Asset/data/asset/functions/effect/0246.flame_devil_armor/fullset/equip.mcfunction new file mode 100644 index 0000000000..2f2cbcab9d --- /dev/null +++ b/Asset/data/asset/functions/effect/0246.flame_devil_armor/fullset/equip.mcfunction @@ -0,0 +1,42 @@ +#> asset:effect/0246.flame_devil_armor/fullset/equip +# @within function asset:effect/0246.flame_devil_armor/*given/ + +# 音 + playsound entity.warden.sonic_boom player @a[distance=..16] ~ ~ ~ 0.5 0.75 0.0 + playsound ogg:item.trident.thunder2 player @a[distance=..16] ~ ~ ~ 0.5 1.5 0.0 +# ダスト + particle dust 100000000 1 0 1.5 ~ ~0.9 ~0 1 1 1 0.0 100 normal +# 円.007 + particle flame ~-0.0 ~0.1 ~1.0 ~14.901 ~0.1 ~1000000000.0 0.00000000020 0 normal + particle flame ~0.383 ~0.1 ~0.924 ~382683456.0 ~0.1 ~923879488.0 0.00000000020 0 normal + particle flame ~0.707 ~0.1 ~0.707 ~707106752.0 ~0.1 ~707106752.0 0.00000000020 0 normal + particle flame ~0.924 ~0.1 ~0.383 ~923879488.0 ~0.1 ~382683456.0 0.00000000020 0 normal + particle flame ~1.0 ~0.1 ~0.0 ~1000000000.0 ~0.1 ~11.176 0.00000000020 0 normal + particle flame ~0.924 ~0.1 ~-0.383 ~923879488.0 ~0.1 ~-382683456.0 0.00000000020 0 normal + particle flame ~0.707 ~0.1 ~-0.707 ~707106752.0 ~0.1 ~-707106752.0 0.00000000020 0 normal + particle flame ~0.383 ~0.1 ~-0.924 ~382683456.0 ~0.1 ~-923879488.0 0.00000000020 0 normal + particle flame ~-0.0 ~0.1 ~-1.0 ~14.901 ~0.1 ~-1000000000.0 0.00000000020 0 normal + particle flame ~-0.383 ~0.1 ~-0.924 ~-382683456.0 ~0.1 ~-923879488.0 0.00000000020 0 normal + particle flame ~-0.707 ~0.1 ~-0.707 ~-707106752.0 ~0.1 ~-707106752.0 0.00000000020 0 normal + particle flame ~-0.924 ~0.1 ~-0.383 ~-923879488.0 ~0.1 ~-382683456.0 0.00000000020 0 normal + particle flame ~-1.0 ~0.1 ~0.0 ~-1000000000.0 ~0.1 ~11.176 0.00000000020 0 normal + particle flame ~-0.924 ~0.1 ~0.383 ~-923879488.0 ~0.1 ~382683456.0 0.00000000020 0 normal + particle flame ~-0.707 ~0.1 ~0.707 ~-707106752.0 ~0.1 ~707106752.0 0.00000000020 0 normal + particle flame ~-0.383 ~0.1 ~0.924 ~-382683456.0 ~0.1 ~923879488.0 0.00000000020 0 normal +# 円.008 + particle end_rod ~0.195 ~0.1 ~0.981 ~195090320.0 ~0.1 ~980785280.0 0.00000000020 0 normal + particle end_rod ~0.556 ~0.1 ~0.831 ~555570304.0 ~0.1 ~831469632.0 0.00000000020 0 normal + particle end_rod ~0.831 ~0.1 ~0.556 ~831469696.0 ~0.1 ~555570240.0 0.00000000020 0 normal + particle end_rod ~0.981 ~0.1 ~0.195 ~980785280.0 ~0.1 ~195090352.0 0.00000000020 0 normal + particle end_rod ~0.981 ~0.1 ~-0.195 ~980785280.0 ~0.1 ~-195090320.0 0.00000000020 0 normal + particle end_rod ~0.831 ~0.1 ~-0.556 ~831469632.0 ~0.1 ~-555570304.0 0.00000000020 0 normal + particle end_rod ~0.556 ~0.1 ~-0.831 ~555570240.0 ~0.1 ~-831469696.0 0.00000000020 0 normal + particle end_rod ~0.195 ~0.1 ~-0.981 ~195090352.0 ~0.1 ~-980785280.0 0.00000000020 0 normal + particle end_rod ~-0.195 ~0.1 ~-0.981 ~-195090320.0 ~0.1 ~-980785280.0 0.00000000020 0 normal + particle end_rod ~-0.556 ~0.1 ~-0.831 ~-555570304.0 ~0.1 ~-831469632.0 0.00000000020 0 normal + particle end_rod ~-0.831 ~0.1 ~-0.556 ~-831469696.0 ~0.1 ~-555570240.0 0.00000000020 0 normal + particle end_rod ~-0.981 ~0.1 ~-0.195 ~-980785280.0 ~0.1 ~-195090352.0 0.00000000020 0 normal + particle end_rod ~-0.981 ~0.1 ~0.195 ~-980785280.0 ~0.1 ~195090320.0 0.00000000020 0 normal + particle end_rod ~-0.831 ~0.1 ~0.556 ~-831469632.0 ~0.1 ~555570304.0 0.00000000020 0 normal + particle end_rod ~-0.556 ~0.1 ~0.831 ~-555570240.0 ~0.1 ~831469696.0 0.00000000020 0 normal + particle end_rod ~-0.195 ~0.1 ~0.981 ~-195090352.0 ~0.1 ~980785280.0 0.00000000020 0 normal diff --git a/Asset/data/asset/functions/effect/0246.flame_devil_armor/given/.mcfunction b/Asset/data/asset/functions/effect/0246.flame_devil_armor/given/.mcfunction new file mode 100644 index 0000000000..7e00c332a4 --- /dev/null +++ b/Asset/data/asset/functions/effect/0246.flame_devil_armor/given/.mcfunction @@ -0,0 +1,11 @@ +#> asset:effect/0246.flame_devil_armor/given/ +# +# Effectが付与された時の処理 +# +# @within function asset:effect/0246.flame_devil_armor/_/given + +# フルセット効果を付与 + execute if data storage asset:context {Stack:4} run function asset:effect/0246.flame_devil_armor/fullset/equip + +# スタックを記録 + data modify storage asset:context this.PrevStack set from storage asset:context Stack diff --git a/Asset/data/asset/functions/effect/0246.flame_devil_armor/re-given/.mcfunction b/Asset/data/asset/functions/effect/0246.flame_devil_armor/re-given/.mcfunction new file mode 100644 index 0000000000..b133c60dc1 --- /dev/null +++ b/Asset/data/asset/functions/effect/0246.flame_devil_armor/re-given/.mcfunction @@ -0,0 +1,11 @@ +#> asset:effect/0246.flame_devil_armor/re-given/ +# +# Effectが上書きされた時の処理 +# +# @within function asset:effect/0246.flame_devil_armor/_/re-given + +# フルセット効果を付与 + execute unless data storage asset:context PreviousField{PrevStack:4} if data storage asset:context {Stack:4} run function asset:effect/0246.flame_devil_armor/fullset/equip + +# スタックを記録 + data modify storage asset:context this.PrevStack set from storage asset:context Stack diff --git a/Asset/data/asset/functions/effect/0246.flame_devil_armor/register.mcfunction b/Asset/data/asset/functions/effect/0246.flame_devil_armor/register.mcfunction new file mode 100644 index 0000000000..c00b860773 --- /dev/null +++ b/Asset/data/asset/functions/effect/0246.flame_devil_armor/register.mcfunction @@ -0,0 +1,32 @@ +#> asset:effect/0246.flame_devil_armor/register +# +# Effectのデータを指定 +# +# @within function asset:effect/0246.flame_devil_armor/_/register + +# ExtendsSafe (boolean) (default = false) + # data modify storage asset:effect ExtendsSafe set value true +# ID (int) + data modify storage asset:effect ID set value 246 +# 名前 (TextComponentString) + data modify storage asset:effect Name set value '[{"text":"炎魔","color":"#C71585","bold":true},{"text":"の鎧","color":"#FF7F50","bold":true}]' +# 説明文 (TextComponentString[]) + data modify storage asset:effect Description set value ['[{"text":"炎魔","color":"#C71585"},{"text":"の力が全て揃いし時、痛みを力に変えられるだろう","color":"#FF7F50"}]'] +# 効果時間 (int) (default = API || error) + data modify storage asset:effect Duration set value 2147483647 +# スタック (int) (default = API || 1) + # data modify storage asset:effect Stack set value +# 効果時間の操作方法 (default = API || "replace") + # data modify storage asset:effect DurationOperation set value +# スタックの操作方法 (default = API || "replace") + data modify storage asset:effect StackOperation set value "forceReplace" +# 最大効果時間 (int) (default = 2147483647) + # data modify storage asset:effect MaxDuration set value +# 最大スタック (int) (default = 2147483647) + data modify storage asset:effect MaxStack set value 4 +# 悪い効果か否か (boolean) + data modify storage asset:effect IsBadEffect set value false +# 死亡時のエフェクトの処理 (default = "remove") + # data modify storage asset:effect ProcessOnDied set value +# 消すのに必要なレベル (int) (default = 1) + data modify storage asset:effect RequireClearLv set value 4 diff --git a/Asset/data/asset/functions/effect/0247.great_demon_armor/_/given.mcfunction b/Asset/data/asset/functions/effect/0247.great_demon_armor/_/given.mcfunction new file mode 100644 index 0000000000..79b3fea6cf --- /dev/null +++ b/Asset/data/asset/functions/effect/0247.great_demon_armor/_/given.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0247.great_demon_armor/_/given +# +# Effectが付与された時に実行されるfunction +# +# @within tag/function asset:effect/given + +execute if data storage asset:context {id:247} run function asset:effect/0247.great_demon_armor/given/ \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0247.great_demon_armor/_/re-given.mcfunction b/Asset/data/asset/functions/effect/0247.great_demon_armor/_/re-given.mcfunction new file mode 100644 index 0000000000..d9860e89b8 --- /dev/null +++ b/Asset/data/asset/functions/effect/0247.great_demon_armor/_/re-given.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0247.great_demon_armor/_/re-given +# +# Effectが上書きされた時に実行されるfunction +# +# @within tag/function asset:effect/re-given + +execute if data storage asset:context {id:247} run function asset:effect/0247.great_demon_armor/re-given/ \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0247.great_demon_armor/_/register.mcfunction b/Asset/data/asset/functions/effect/0247.great_demon_armor/_/register.mcfunction new file mode 100644 index 0000000000..c9c9bf73b9 --- /dev/null +++ b/Asset/data/asset/functions/effect/0247.great_demon_armor/_/register.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0247.great_demon_armor/_/register +# +# +# +# @within tag/function asset:effect/register + +execute if data storage asset:context {id:247} run function asset:effect/0247.great_demon_armor/register \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0247.great_demon_armor/_/tick.mcfunction b/Asset/data/asset/functions/effect/0247.great_demon_armor/_/tick.mcfunction new file mode 100644 index 0000000000..9338556ac9 --- /dev/null +++ b/Asset/data/asset/functions/effect/0247.great_demon_armor/_/tick.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0247.great_demon_armor/_/tick +# +# Effectが発動している間毎tick実行されるfunction +# +# @within tag/function asset:effect/tick + +execute if data storage asset:context {id:247} run function asset:effect/0247.great_demon_armor/tick/ \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0247.great_demon_armor/fullset/equip.mcfunction b/Asset/data/asset/functions/effect/0247.great_demon_armor/fullset/equip.mcfunction new file mode 100644 index 0000000000..836eb5655e --- /dev/null +++ b/Asset/data/asset/functions/effect/0247.great_demon_armor/fullset/equip.mcfunction @@ -0,0 +1,84 @@ +#> asset:effect/0247.great_demon_armor/fullset/equip +# @within function asset:effect/0247.great_demon_armor/*given/ + +# 音 + playsound entity.wither.spawn player @a[distance=..16] ~ ~ ~ 0.15 0.5 0.0 + playsound entity.warden.sonic_boom player @a[distance=..16] ~ ~ ~ 0.5 0.75 0.0 + playsound block.conduit.deactivate player @a[distance=..16] ~ ~ ~ 1 0.5 0.0 +# ダスト + particle dust 0.3347 0.3347 0.3347 1.5 ~ ~0.9 ~0 1 1 1 0.0 100 normal +# 円.001 + particle end_rod ^-0.0 ^0.9 ^1.0 ^3.512 ^0.9 ^1000000000.0 0.00000000010 0 normal + particle end_rod ^0.183 ^1.083 ^0.966 ^183012704.0 ^183012624.0 ^965925952.0 0.00000000010 0 normal + particle end_rod ^0.354 ^1.254 ^0.866 ^353553408.0 ^353553312.0 ^866025536.0 0.00000000010 0 normal + particle end_rod ^0.5 ^1.4 ^0.707 ^500000000.0 ^499999936.0 ^707106816.0 0.00000000010 0 normal + particle end_rod ^0.612 ^1.512 ^0.5 ^612372416.0 ^612372544.0 ^500000000.0 0.00000000010 0 normal + particle end_rod ^0.683 ^1.583 ^0.259 ^683012672.0 ^683012736.0 ^258819104.0 0.00000000010 0 normal + particle end_rod ^0.707 ^1.607 ^0.0 ^707106752.0 ^707106816.0 ^17.385 0.00000000010 0 normal + particle end_rod ^0.683 ^1.583 ^-0.259 ^683012672.0 ^683012736.0 ^-258818992.0 0.00000000010 0 normal + particle end_rod ^0.612 ^1.512 ^-0.5 ^612372416.0 ^612372544.0 ^-499999936.0 0.00000000010 0 normal + particle end_rod ^0.5 ^1.4 ^-0.707 ^500000000.0 ^499999936.0 ^-707106816.0 0.00000000010 0 normal + particle end_rod ^0.354 ^1.254 ^-0.866 ^353553408.0 ^353553312.0 ^-866025536.0 0.00000000010 0 normal + particle end_rod ^0.183 ^1.083 ^-0.966 ^183012704.0 ^183012624.0 ^-965925952.0 0.00000000010 0 normal + particle end_rod ^-0.0 ^0.9 ^-1.0 ^3.512 ^0.9 ^-1000000000.0 0.00000000010 0 normal + particle end_rod ^-0.183 ^0.717 ^-0.966 ^-183012688.0 ^-183012672.0 ^-965925824.0 0.00000000010 0 normal + particle end_rod ^-0.354 ^0.546 ^-0.866 ^-353553376.0 ^-353553344.0 ^-866025408.0 0.00000000010 0 normal + particle end_rod ^-0.5 ^0.4 ^-0.707 ^-500000000.0 ^-500000000.0 ^-707106816.0 0.00000000010 0 normal + particle end_rod ^-0.612 ^0.288 ^-0.5 ^-612372480.0 ^-612372480.0 ^-500000000.0 0.00000000010 0 normal + particle end_rod ^-0.683 ^0.217 ^-0.259 ^-683012736.0 ^-683012736.0 ^-258819008.0 0.00000000010 0 normal + particle end_rod ^-0.707 ^0.193 ^0.0 ^-707106752.0 ^-707106752.0 ^17.385 0.00000000010 0 normal + particle end_rod ^-0.683 ^0.217 ^0.259 ^-683012736.0 ^-683012736.0 ^258819136.0 0.00000000010 0 normal + particle end_rod ^-0.612 ^0.288 ^0.5 ^-612372480.0 ^-612372480.0 ^500000064.0 0.00000000010 0 normal + particle end_rod ^-0.5 ^0.4 ^0.707 ^-500000000.0 ^-500000000.0 ^707106816.0 0.00000000010 0 normal + particle end_rod ^-0.354 ^0.546 ^0.866 ^-353553376.0 ^-353553344.0 ^866025408.0 0.00000000010 0 normal + particle end_rod ^-0.183 ^0.717 ^0.966 ^-183012688.0 ^-183012672.0 ^965925824.0 0.00000000010 0 normal +# 円.002 + particle end_rod ^-0.0 ^0.9 ^1.0 ^4.967 ^0.9 ^1000000000.0 0.00000000010 0 normal + particle end_rod ^0.259 ^0.9 ^0.966 ^258819040.0 ^0.9 ^965925824.0 0.00000000010 0 normal + particle end_rod ^0.5 ^0.9 ^0.866 ^500000000.0 ^0.9 ^866025408.0 0.00000000010 0 normal + particle end_rod ^0.707 ^0.9 ^0.707 ^707106752.0 ^0.9 ^707106752.0 0.00000000010 0 normal + particle end_rod ^0.866 ^0.9 ^0.5 ^866025408.0 ^0.9 ^500000000.0 0.00000000010 0 normal + particle end_rod ^0.966 ^0.9 ^0.259 ^965925824.0 ^0.9 ^258819104.0 0.00000000010 0 normal + particle end_rod ^1.0 ^0.9 ^0.0 ^1000000000.0 ^0.9 ^17.385 0.00000000010 0 normal + particle end_rod ^0.966 ^0.9 ^-0.259 ^965925824.0 ^0.9 ^-258818992.0 0.00000000010 0 normal + particle end_rod ^0.866 ^0.9 ^-0.5 ^866025536.0 ^0.9 ^-500000000.0 0.00000000010 0 normal + particle end_rod ^0.707 ^0.9 ^-0.707 ^707106752.0 ^0.9 ^-707106752.0 0.00000000010 0 normal + particle end_rod ^0.5 ^0.9 ^-0.866 ^500000000.0 ^0.9 ^-866025408.0 0.00000000010 0 normal + particle end_rod ^0.259 ^0.9 ^-0.966 ^258819040.0 ^0.9 ^-965925824.0 0.00000000010 0 normal + particle end_rod ^-0.0 ^0.9 ^-1.0 ^4.967 ^0.9 ^-1000000000.0 0.00000000010 0 normal + particle end_rod ^-0.259 ^0.9 ^-0.966 ^-258819040.0 ^0.9 ^-965925824.0 0.00000000010 0 normal + particle end_rod ^-0.5 ^0.9 ^-0.866 ^-500000000.0 ^0.9 ^-866025408.0 0.00000000010 0 normal + particle end_rod ^-0.707 ^0.9 ^-0.707 ^-707106752.0 ^0.9 ^-707106752.0 0.00000000010 0 normal + particle end_rod ^-0.866 ^0.9 ^-0.5 ^-866025536.0 ^0.9 ^-500000000.0 0.00000000010 0 normal + particle end_rod ^-0.966 ^0.9 ^-0.259 ^-965925824.0 ^0.9 ^-258818992.0 0.00000000010 0 normal + particle end_rod ^-1.0 ^0.9 ^0.0 ^-1000000000.0 ^0.9 ^17.385 0.00000000010 0 normal + particle end_rod ^-0.966 ^0.9 ^0.259 ^-965925824.0 ^0.9 ^258819104.0 0.00000000010 0 normal + particle end_rod ^-0.866 ^0.9 ^0.5 ^-866025408.0 ^0.9 ^500000000.0 0.00000000010 0 normal + particle end_rod ^-0.707 ^0.9 ^0.707 ^-707106752.0 ^0.9 ^707106752.0 0.00000000010 0 normal + particle end_rod ^-0.5 ^0.9 ^0.866 ^-500000000.0 ^0.9 ^866025408.0 0.00000000010 0 normal + particle end_rod ^-0.259 ^0.9 ^0.966 ^-258819040.0 ^0.9 ^965925824.0 0.00000000010 0 normal +# 円.003 + particle end_rod ^-0.0 ^0.9 ^1.0 ^3.512 ^0.9 ^1000000000.0 0.00000000010 0 normal + particle end_rod ^0.183 ^0.717 ^0.966 ^183012688.0 ^-183012672.0 ^965925824.0 0.00000000010 0 normal + particle end_rod ^0.354 ^0.546 ^0.866 ^353553376.0 ^-353553344.0 ^866025408.0 0.00000000010 0 normal + particle end_rod ^0.5 ^0.4 ^0.707 ^500000000.0 ^-500000000.0 ^707106816.0 0.00000000010 0 normal + particle end_rod ^0.612 ^0.288 ^0.5 ^612372480.0 ^-612372480.0 ^500000064.0 0.00000000010 0 normal + particle end_rod ^0.683 ^0.217 ^0.259 ^683012736.0 ^-683012736.0 ^258819136.0 0.00000000010 0 normal + particle end_rod ^0.707 ^0.193 ^0.0 ^707106752.0 ^-707106752.0 ^17.385 0.00000000010 0 normal + particle end_rod ^0.683 ^0.217 ^-0.259 ^683012736.0 ^-683012736.0 ^-258819008.0 0.00000000010 0 normal + particle end_rod ^0.612 ^0.288 ^-0.5 ^612372480.0 ^-612372480.0 ^-500000000.0 0.00000000010 0 normal + particle end_rod ^0.5 ^0.4 ^-0.707 ^500000000.0 ^-500000000.0 ^-707106816.0 0.00000000010 0 normal + particle end_rod ^0.354 ^0.546 ^-0.866 ^353553376.0 ^-353553344.0 ^-866025408.0 0.00000000010 0 normal + particle end_rod ^0.183 ^0.717 ^-0.966 ^183012688.0 ^-183012672.0 ^-965925824.0 0.00000000010 0 normal + particle end_rod ^-0.0 ^0.9 ^-1.0 ^3.512 ^0.9 ^-1000000000.0 0.00000000010 0 normal + particle end_rod ^-0.183 ^1.083 ^-0.966 ^-183012704.0 ^183012624.0 ^-965925952.0 0.00000000010 0 normal + particle end_rod ^-0.354 ^1.254 ^-0.866 ^-353553408.0 ^353553312.0 ^-866025536.0 0.00000000010 0 normal + particle end_rod ^-0.5 ^1.4 ^-0.707 ^-500000000.0 ^499999936.0 ^-707106816.0 0.00000000010 0 normal + particle end_rod ^-0.612 ^1.512 ^-0.5 ^-612372416.0 ^612372544.0 ^-499999936.0 0.00000000010 0 normal + particle end_rod ^-0.683 ^1.583 ^-0.259 ^-683012672.0 ^683012736.0 ^-258818992.0 0.00000000010 0 normal + particle end_rod ^-0.707 ^1.607 ^0.0 ^-707106752.0 ^707106816.0 ^17.385 0.00000000010 0 normal + particle end_rod ^-0.683 ^1.583 ^0.259 ^-683012672.0 ^683012736.0 ^258819104.0 0.00000000010 0 normal + particle end_rod ^-0.612 ^1.512 ^0.5 ^-612372416.0 ^612372544.0 ^500000000.0 0.00000000010 0 normal + particle end_rod ^-0.5 ^1.4 ^0.707 ^-500000000.0 ^499999936.0 ^707106816.0 0.00000000010 0 normal + particle end_rod ^-0.354 ^1.254 ^0.866 ^-353553408.0 ^353553312.0 ^866025536.0 0.00000000010 0 normal + particle end_rod ^-0.183 ^1.083 ^0.966 ^-183012704.0 ^183012624.0 ^965925952.0 0.00000000010 0 normal diff --git a/Asset/data/asset/functions/effect/0247.great_demon_armor/fullset/heal.mcfunction b/Asset/data/asset/functions/effect/0247.great_demon_armor/fullset/heal.mcfunction new file mode 100644 index 0000000000..df2ab47246 --- /dev/null +++ b/Asset/data/asset/functions/effect/0247.great_demon_armor/fullset/heal.mcfunction @@ -0,0 +1,8 @@ +#> asset:effect/0247.great_demon_armor/fullset/heal +# @within function asset:effect/0247.great_demon_armor/fullset/passive + +# 1HP回復 + data modify storage api: Argument.Heal set value 1.0 + function api:heal/modifier + function api:heal/ + function api:heal/reset diff --git a/Asset/data/asset/functions/effect/0247.great_demon_armor/fullset/passive.mcfunction b/Asset/data/asset/functions/effect/0247.great_demon_armor/fullset/passive.mcfunction new file mode 100644 index 0000000000..aa194c5136 --- /dev/null +++ b/Asset/data/asset/functions/effect/0247.great_demon_armor/fullset/passive.mcfunction @@ -0,0 +1,16 @@ +#> asset:effect/0247.great_demon_armor/fullset/passive +# @within function asset:effect/0247.great_demon_armor/tick/ + +#> Private +# @private + #declare score_holder $6V.IGT + +# tickを取得 + execute store result score $6V.IGT Temporary run data get storage asset:context this.Tick +# 12以上なら回復 + scoreboard players add $6V.IGT Temporary 1 + execute if score $6V.IGT Temporary matches 12.. run function asset:effect/0247.great_demon_armor/fullset/heal + execute if score $6V.IGT Temporary matches 12.. run scoreboard players remove $6V.IGT Temporary 12 + execute store result storage asset:context this.Tick int 1 run scoreboard players get $6V.IGT Temporary +# リセット + scoreboard players reset $6V.IGT Temporary diff --git a/Asset/data/asset/functions/effect/0247.great_demon_armor/given/.mcfunction b/Asset/data/asset/functions/effect/0247.great_demon_armor/given/.mcfunction new file mode 100644 index 0000000000..4075717979 --- /dev/null +++ b/Asset/data/asset/functions/effect/0247.great_demon_armor/given/.mcfunction @@ -0,0 +1,11 @@ +#> asset:effect/0247.great_demon_armor/given/ +# +# Effectが付与された時の処理 +# +# @within function asset:effect/0247.great_demon_armor/_/given + +# フルセット効果を付与 + execute if data storage asset:context {Stack:4} run function asset:effect/0247.great_demon_armor/fullset/equip + +# スタックを記録 + data modify storage asset:context this.PrevStack set from storage asset:context Stack diff --git a/Asset/data/asset/functions/effect/0247.great_demon_armor/re-given/.mcfunction b/Asset/data/asset/functions/effect/0247.great_demon_armor/re-given/.mcfunction new file mode 100644 index 0000000000..3ffd8dfd54 --- /dev/null +++ b/Asset/data/asset/functions/effect/0247.great_demon_armor/re-given/.mcfunction @@ -0,0 +1,14 @@ +#> asset:effect/0247.great_demon_armor/re-given/ +# +# Effectが上書きされた時の処理 +# +# @within function asset:effect/0247.great_demon_armor/_/re-given + +# フルセット効果を付与 + execute unless data storage asset:context PreviousField{PrevStack:4} if data storage asset:context {Stack:4} run function asset:effect/0247.great_demon_armor/fullset/equip + +# フルセット効果の引継ぎ + execute if data storage asset:context PreviousField{PrevStack:4} run data modify storage asset:context this.Tick set from storage asset:context PreviousField.Tick + +# スタックを記録 + data modify storage asset:context this.PrevStack set from storage asset:context Stack diff --git a/Asset/data/asset/functions/effect/0247.great_demon_armor/register.mcfunction b/Asset/data/asset/functions/effect/0247.great_demon_armor/register.mcfunction new file mode 100644 index 0000000000..1afa185b14 --- /dev/null +++ b/Asset/data/asset/functions/effect/0247.great_demon_armor/register.mcfunction @@ -0,0 +1,32 @@ +#> asset:effect/0247.great_demon_armor/register +# +# Effectのデータを指定 +# +# @within function asset:effect/0247.great_demon_armor/_/register + +# ExtendsSafe (boolean) (default = false) + # data modify storage asset:effect ExtendsSafe set value true +# ID (int) + data modify storage asset:effect ID set value 247 +# 名前 (TextComponentString) + data modify storage asset:effect Name set value '[{"text":"豪鬼","color":"#A6A6A6","bold":true},{"text":"の鎧","color":"white","bold":true}]' +# 説明文 (TextComponentString[]) + data modify storage asset:effect Description set value ['[{"text":"豪鬼","color":"#A6A6A6"},{"text":"の力が全て揃いし時、超回復力を手に入れる。","color":"white"}]'] +# 効果時間 (int) (default = API || error) + data modify storage asset:effect Duration set value 2147483647 +# スタック (int) (default = API || 1) + # data modify storage asset:effect Stack set value +# 効果時間の操作方法 (default = API || "replace") + # data modify storage asset:effect DurationOperation set value +# スタックの操作方法 (default = API || "replace") + data modify storage asset:effect StackOperation set value "forceReplace" +# 最大効果時間 (int) (default = 2147483647) + # data modify storage asset:effect MaxDuration set value +# 最大スタック (int) (default = 2147483647) + data modify storage asset:effect MaxStack set value 4 +# 悪い効果か否か (boolean) + data modify storage asset:effect IsBadEffect set value false +# 死亡時のエフェクトの処理 (default = "remove") + # data modify storage asset:effect ProcessOnDied set value +# 消すのに必要なレベル (int) (default = 1) + data modify storage asset:effect RequireClearLv set value 4 diff --git a/Asset/data/asset/functions/effect/0247.great_demon_armor/tick/.mcfunction b/Asset/data/asset/functions/effect/0247.great_demon_armor/tick/.mcfunction new file mode 100644 index 0000000000..0c92444582 --- /dev/null +++ b/Asset/data/asset/functions/effect/0247.great_demon_armor/tick/.mcfunction @@ -0,0 +1,8 @@ +#> asset:effect/0247.great_demon_armor/tick/ +# +# Effectのtick処理 +# +# @within function asset:effect/0247.great_demon_armor/_/tick + +# 演出 + execute if data storage asset:context {Stack:4} run function asset:effect/0247.great_demon_armor/fullset/passive diff --git a/Asset/data/asset/predicates/artifact/0563.heartland/regene_check.json b/Asset/data/asset/predicates/effect/0237.heartland/regene_check.json similarity index 100% rename from Asset/data/asset/predicates/artifact/0563.heartland/regene_check.json rename to Asset/data/asset/predicates/effect/0237.heartland/regene_check.json diff --git a/Asset/data/asset/tags/functions/artifact/attack.json b/Asset/data/asset/tags/functions/artifact/attack.json index 28f9942666..8d28436b25 100644 --- a/Asset/data/asset/tags/functions/artifact/attack.json +++ b/Asset/data/asset/tags/functions/artifact/attack.json @@ -1,7 +1,7 @@ { "values": [ "asset:artifact/1098.mirror_piece_of_bygone_days/trigger/1.trigger", - "asset:artifact/0664.soul_fire_armor/trigger/fullset/attack_trigger", + "asset:artifact/0664.soul_fire_armor/trigger/attack/1.trigger", "asset:artifact/0724.oblivious_snow/trigger/fullset/trigger" ] } diff --git a/Asset/data/asset/tags/functions/artifact/attack/melee.json b/Asset/data/asset/tags/functions/artifact/attack/melee.json index ac8c037634..4e2113bd7d 100644 --- a/Asset/data/asset/tags/functions/artifact/attack/melee.json +++ b/Asset/data/asset/tags/functions/artifact/attack/melee.json @@ -1,7 +1,7 @@ { "values": [ "asset:artifact/0600.xtal/trigger/1.trigger", - "asset:artifact/0643.raimei_chestplate/trigger/1.1.attacktrigger", + "asset:artifact/0643.raimei_chestplate/trigger/attack/1.trigger", "asset:artifact/1078.pigeon_blood/trigger/1.trigger", "asset:artifact/0719.sword_of_divine_sound/trigger/1.trigger", "asset:artifact/0606.traffic_sign/trigger/1.trigger", diff --git a/Asset/data/asset/tags/functions/artifact/dis_equip.json b/Asset/data/asset/tags/functions/artifact/dis_equip.json index e2f7a1d9b4..84504b8ec8 100644 --- a/Asset/data/asset/tags/functions/artifact/dis_equip.json +++ b/Asset/data/asset/tags/functions/artifact/dis_equip.json @@ -1,94 +1,77 @@ { "values": [ - "asset:artifact/1032.life_charm/trigger/dis_equip/", - "asset:artifact/0667.soul_fire_armor/trigger/dis_equip/", - "asset:artifact/0666.soul_fire_armor/trigger/dis_equip/", - "asset:artifact/0665.soul_fire_armor/trigger/dis_equip/", - "asset:artifact/0664.soul_fire_armor/trigger/dis_equip/", "asset:artifact/0624.flame_helm/trigger/dis_equip/", "asset:artifact/0625.flame_armor/trigger/dis_equip/", "asset:artifact/0626.flame_leggings/trigger/dis_equip/", "asset:artifact/0627.flame_boots/trigger/dis_equip/", - "asset:artifact/0642.raimei_helmet/trigger/dis_equip/", - "asset:artifact/0643.raimei_chestplate/trigger/dis_equip/", - "asset:artifact/0644.raimei_leggings/trigger/dis_equip/", - "asset:artifact/0645.raimei_boots/trigger/dis_equip/", - "asset:artifact/0632.elec_helm/trigger/dis_equip/", - "asset:artifact/0633.elec_armor/trigger/dis_equip/", - "asset:artifact/0634.elec_leggings/trigger/dis_equip/", - "asset:artifact/0635.elec_boots/trigger/dis_equip/", "asset:artifact/0628.ice_helm/trigger/dis_equip/", "asset:artifact/0629.ice_armor/trigger/dis_equip/", "asset:artifact/0630.ice_leggings/trigger/dis_equip/", "asset:artifact/0631.ice_boots/trigger/dis_equip/", - "asset:artifact/1060.great_demon_boots/trigger/dis_equip/", - "asset:artifact/1059.great_demon_leg/trigger/dis_equip/", - "asset:artifact/1058.great_demon_chest/trigger/dis_equip/", - "asset:artifact/1057.great_demon_head/trigger/dis_equip/", - "asset:artifact/1066.weight_stone/trigger/dis_equip/", - "asset:artifact/1053.grimoire_of_purity/trigger/dis_equip/", - "asset:artifact/0718.world_tree_root/trigger/dis_equip/", - "asset:artifact/0717.world_tree_stem/trigger/dis_equip/", - "asset:artifact/0716.world_tree_branch/trigger/dis_equip/", - "asset:artifact/0715.world_tree_crown/trigger/dis_equip/", - "asset:artifact/0690.steam_core/trigger/dis_equip/", - "asset:artifact/0641.spirit_garment/trigger/dis_equip/", - "asset:artifact/0640.spirit_garment/trigger/dis_equip/", - "asset:artifact/0639.spirit_garment/trigger/dis_equip/", + "asset:artifact/0632.elec_helm/trigger/dis_equip/", + "asset:artifact/0633.elec_armor/trigger/dis_equip/", + "asset:artifact/0634.elec_leggings/trigger/dis_equip/", + "asset:artifact/0635.elec_boots/trigger/dis_equip/", "asset:artifact/0638.spirit_garment/trigger/dis_equip/", - "asset:artifact/0740.flower_of_hazy_moon/trigger/dis_equip/", - "asset:artifact/0743.evening_wind/trigger/dis_equip/", - "asset:artifact/0727.oblivious_snow/trigger/dis_equip/", - "asset:artifact/0726.oblivious_snow/trigger/dis_equip/", - "asset:artifact/0725.oblivious_snow/trigger/dis_equip/", - "asset:artifact/0724.oblivious_snow/trigger/dis_equip/", - "asset:artifact/0790.aurora_boots/trigger/dis_equip/", - "asset:artifact/0789.aurora_leggings/trigger/dis_equip/", - "asset:artifact/0788.aurora_armor/trigger/dis_equip/", - "asset:artifact/0787.aurora_helm/trigger/dis_equip/", - "asset:artifact/0713.deep_sea_coral_leggings/trigger/dis_equip/", + "asset:artifact/0639.spirit_garment/trigger/dis_equip/", + "asset:artifact/0640.spirit_garment/trigger/dis_equip/", + "asset:artifact/0641.spirit_garment/trigger/dis_equip/", + "asset:artifact/0664.soul_fire_armor/trigger/dis_equip/", + "asset:artifact/0665.soul_fire_armor/trigger/dis_equip/", + "asset:artifact/0666.soul_fire_armor/trigger/dis_equip/", + "asset:artifact/0667.soul_fire_armor/trigger/dis_equip/", + "asset:artifact/0711.deep_sea_coral_crown/trigger/dis_equip/", "asset:artifact/0712.deep_sea_coral_raiment/trigger/dis_equip/", + "asset:artifact/0713.deep_sea_coral_leggings/trigger/dis_equip/", "asset:artifact/0714.deep_sea_coral_boots/trigger/dis_equip/", - "asset:artifact/0711.deep_sea_coral_crown/trigger/dis_equip/", - "asset:artifact/1041.flame_devil_feet/trigger/dis_equip/", - "asset:artifact/1040.flame_devil_legs/trigger/dis_equip/", - "asset:artifact/1039.flame_devil_chest/trigger/dis_equip/", - "asset:artifact/1038.flame_devil_head/trigger/dis_equip/", + "asset:artifact/0715.world_tree_crown/trigger/dis_equip/", + "asset:artifact/0716.world_tree_branch/trigger/dis_equip/", + "asset:artifact/0717.world_tree_stem/trigger/dis_equip/", + "asset:artifact/0718.world_tree_root/trigger/dis_equip/", + "asset:artifact/0724.oblivious_snow/trigger/dis_equip/", + "asset:artifact/0725.oblivious_snow/trigger/dis_equip/", + "asset:artifact/0726.oblivious_snow/trigger/dis_equip/", + "asset:artifact/0727.oblivious_snow/trigger/dis_equip/", "asset:artifact/0736.sailor_hat/trigger/dis_equip/", - "asset:artifact/0986.order_of_healing/trigger/dis_equip/", - "asset:artifact/0980.thunder_charm/trigger/dis_equip/", - "asset:artifact/0979.water_charm/trigger/dis_equip/", - "asset:artifact/0978.fire_charm/trigger/dis_equip/", + "asset:artifact/0740.flower_of_hazy_moon/trigger/dis_equip/", + "asset:artifact/0743.evening_wind/trigger/dis_equip/", + "asset:artifact/0775.jade_armor/trigger/dis_equip/", + "asset:artifact/0776.jade_armor/trigger/dis_equip/", + "asset:artifact/0777.jade_armor/trigger/dis_equip/", + "asset:artifact/0778.jade_armor/trigger/dis_equip/", + "asset:artifact/0787.aurora_helm/trigger/dis_equip/", + "asset:artifact/0788.aurora_armor/trigger/dis_equip/", + "asset:artifact/0789.aurora_leggings/trigger/dis_equip/", + "asset:artifact/0790.aurora_boots/trigger/dis_equip/", "asset:artifact/0898.gale_pendant/trigger/dis_equip/", "asset:artifact/0899.flame_ring/trigger/dis_equip/", - "asset:artifact/0918.flame_hunter_boots/trigger/dis_equip/", - "asset:artifact/0917.flame_hunter_clothes/trigger/dis_equip/", - "asset:artifact/0916.flame_hunter_clothes/trigger/dis_equip/", "asset:artifact/0915.flame_hunter_hat/trigger/dis_equip/", - "asset:artifact/0937.ideal_boots/trigger/dis_equip/", - "asset:artifact/0936.ideal_leggings/trigger/dis_equip/", - "asset:artifact/0935.ideal_chestplate/trigger/dis_equip/", - "asset:artifact/0934.ideal_helmet/trigger/dis_equip/", + "asset:artifact/0916.flame_hunter_clothes/trigger/dis_equip/", + "asset:artifact/0917.flame_hunter_clothes/trigger/dis_equip/", + "asset:artifact/0918.flame_hunter_boots/trigger/dis_equip/", + "asset:artifact/0930.z_flag/trigger/dis_equip/", "asset:artifact/0932.equal_speed_charlie_london/trigger/dis_equip/", - "asset:artifact/0961.light_charm/trigger/dis_equip/", - "asset:artifact/0960.heavy_charm/trigger/dis_equip/", + "asset:artifact/0934.ideal_helmet/trigger/dis_equip/", + "asset:artifact/0935.ideal_chestplate/trigger/dis_equip/", + "asset:artifact/0936.ideal_leggings/trigger/dis_equip/", + "asset:artifact/0937.ideal_boots/trigger/dis_equip/", "asset:artifact/0954.inverted_parachute/trigger/dis_equip/", - "asset:artifact/0930.z_flag/trigger/dis_equip/", - "asset:artifact/0778.jade_armor/trigger/dis_equip/", - "asset:artifact/0777.jade_armor/trigger/dis_equip/", - "asset:artifact/0776.jade_armor/trigger/dis_equip/", - "asset:artifact/0775.jade_armor/trigger/dis_equip/", - "asset:artifact/0646.thorn_helm/trigger/dis_equip/", - "asset:artifact/0647.thorn_armor/trigger/dis_equip/", - "asset:artifact/0648.thorn_leggings/trigger/dis_equip/", - "asset:artifact/0649.thorn_boots/trigger/dis_equip/", - "asset:artifact/0703.wizard_hat/trigger/dis_equip/", - "asset:artifact/0704.wizard_robe_upper/trigger/dis_equip/", - "asset:artifact/0705.wizard_robe_lower/trigger/dis_equip/", - "asset:artifact/0706.wizard_boots/trigger/dis_equip/", - "asset:artifact/0707.mage_hat/trigger/dis_equip/", - "asset:artifact/0708.mage_robe_upper/trigger/dis_equip/", - "asset:artifact/0709.mage_robe_lower/trigger/dis_equip/", - "asset:artifact/0710.mage_boots/trigger/dis_equip/" + "asset:artifact/0960.heavy_charm/trigger/dis_equip/", + "asset:artifact/0961.light_charm/trigger/dis_equip/", + "asset:artifact/0978.fire_charm/trigger/dis_equip/", + "asset:artifact/0979.water_charm/trigger/dis_equip/", + "asset:artifact/0980.thunder_charm/trigger/dis_equip/", + "asset:artifact/0986.order_of_healing/trigger/dis_equip/", + "asset:artifact/1032.life_charm/trigger/dis_equip/", + "asset:artifact/1038.flame_devil_head/trigger/dis_equip/", + "asset:artifact/1039.flame_devil_chest/trigger/dis_equip/", + "asset:artifact/1040.flame_devil_legs/trigger/dis_equip/", + "asset:artifact/1041.flame_devil_feet/trigger/dis_equip/", + "asset:artifact/1053.grimoire_of_purity/trigger/dis_equip/", + "asset:artifact/1057.great_demon_head/trigger/dis_equip/", + "asset:artifact/1058.great_demon_chest/trigger/dis_equip/", + "asset:artifact/1059.great_demon_leg/trigger/dis_equip/", + "asset:artifact/1060.great_demon_boots/trigger/dis_equip/", + "asset:artifact/1066.weight_stone/trigger/dis_equip/" ] -} \ No newline at end of file +} diff --git a/Asset/data/asset/tags/functions/artifact/equip.json b/Asset/data/asset/tags/functions/artifact/equip.json index 908275cef7..c7f733337a 100644 --- a/Asset/data/asset/tags/functions/artifact/equip.json +++ b/Asset/data/asset/tags/functions/artifact/equip.json @@ -1,12 +1,8 @@ { "values": [ "asset:artifact/1032.life_charm/trigger/1.trigger", - "asset:artifact/0667.soul_fire_armor/trigger/1.trigger", - "asset:artifact/0666.soul_fire_armor/trigger/1.trigger", - "asset:artifact/0665.soul_fire_armor/trigger/1.trigger", - "asset:artifact/0664.soul_fire_armor/trigger/1.trigger", "asset:artifact/0642.raimei_helmet/trigger/1.trigger", - "asset:artifact/0643.raimei_chestplate/trigger/1.trigger", + "asset:artifact/0643.raimei_chestplate/trigger/equip/1.trigger", "asset:artifact/0644.raimei_leggings/trigger/1.trigger", "asset:artifact/0645.raimei_boots/trigger/1.trigger", "asset:artifact/0632.elec_helm/trigger/1.trigger", @@ -79,7 +75,7 @@ "asset:artifact/0776.jade_armor/trigger/1.trigger", "asset:artifact/0775.jade_armor/trigger/1.trigger", "asset:artifact/0646.thorn_helm/trigger/1.trigger", - "asset:artifact/0647.thorn_armor/trigger/1.trigger", + "asset:artifact/0647.thorn_armor/trigger/equip/1.trigger", "asset:artifact/0648.thorn_leggings/trigger/1.trigger", "asset:artifact/0649.thorn_boots/trigger/1.trigger", "asset:artifact/0703.wizard_hat/trigger/1.trigger", @@ -91,4 +87,4 @@ "asset:artifact/0709.mage_robe_lower/trigger/1.trigger", "asset:artifact/0710.mage_boots/trigger/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 51c1f88d79..960d600727 100644 --- a/Asset/data/asset/tags/functions/artifact/load.json +++ b/Asset/data/asset/tags/functions/artifact/load.json @@ -3,7 +3,6 @@ "asset:artifact/1024.brave_rod/trigger/0.load", "asset:artifact/0837.the_world_knife/trigger/0.load", "asset:artifact/0600.xtal/trigger/0.load", - "asset:artifact/0664.soul_fire_armor/trigger/0.load", "asset:artifact/0105.secret_meat/trigger/0.load", "asset:artifact/1047.life_steal_emblem/trigger/0.load", "asset:artifact/1048.thunder_storm/trigger/0.load", @@ -59,7 +58,6 @@ "asset:artifact/0369.fire_magic/trigger/0.load", "asset:artifact/0379.miracle_rod/trigger/0.load", "asset:artifact/0610.call_fish/trigger/0.load", - "asset:artifact/0647.thorn_armor/trigger/0.load", "asset:artifact/0261.holy_symbol_lv.1/trigger/0.load", "asset:artifact/0262.angel_ray_lv.1/trigger/0.load", "asset:artifact/0265.holy_symbol_lv.5/trigger/0.load", diff --git a/Asset/data/asset/tags/functions/artifact/tick.json b/Asset/data/asset/tags/functions/artifact/tick.json index 9085c52d2e..32fe5fa49c 100644 --- a/Asset/data/asset/tags/functions/artifact/tick.json +++ b/Asset/data/asset/tags/functions/artifact/tick.json @@ -16,7 +16,6 @@ "asset:artifact/0167.blessing_helmet/trigger/1.trigger", "asset:artifact/0204.spelunker_shoes/trigger/1.trigger", "asset:artifact/0207.life_is_transitory/trigger/1.trigger", - "asset:artifact/0468.raging_demon/trigger/1.trigger", - "asset:artifact/0563.heartland/trigger/1.trigger" + "asset:artifact/0468.raging_demon/trigger/1.trigger" ] } diff --git a/Asset/data/asset/tags/functions/effect/given.json b/Asset/data/asset/tags/functions/effect/given.json index 3d3a96497c..87356f6d4c 100644 --- a/Asset/data/asset/tags/functions/effect/given.json +++ b/Asset/data/asset/tags/functions/effect/given.json @@ -17,6 +17,18 @@ "asset:effect/0221.hunters_run/_/given", "asset:effect/0230.farothdal/_/given", "asset:effect/0231.wandering_dream/_/given", + "asset:effect/0232.soul_fire/_/given", + "asset:effect/0233.flame_armor/_/given", + "asset:effect/0234.ice_armor/_/given", + "asset:effect/0235.elec_armor/_/given", + "asset:effect/0238.raimei/_/given", + "asset:effect/0239.thorn_armor/_/given", + "asset:effect/0240.bless_of_deep_sea_coral/_/given", + "asset:effect/0243.oblivious_snow/_/given", + "asset:effect/0244.aurora_armor/_/given", + "asset:effect/0245.flame_hunter_attire/_/given", + "asset:effect/0246.flame_devil_armor/_/given", + "asset:effect/0247.great_demon_armor/_/given", "asset:effect/0248.oracle_physical_attack/_/given", "asset:effect/0249.oracle_physical_defense/_/given", "asset:effect/0250.oracle_magic_attack/_/given", diff --git a/Asset/data/asset/tags/functions/effect/re-given.json b/Asset/data/asset/tags/functions/effect/re-given.json index 0e31070541..3f88dbe301 100644 --- a/Asset/data/asset/tags/functions/effect/re-given.json +++ b/Asset/data/asset/tags/functions/effect/re-given.json @@ -3,6 +3,18 @@ "asset:effect/0202.sheep_blessing/_/re-given", "asset:effect/0218.heavy_weight/_/re-given", "asset:effect/0220.dream_of_burning_butterfly/_/re-given", + "asset:effect/0232.soul_fire/_/re-given", + "asset:effect/0233.flame_armor/_/re-given", + "asset:effect/0234.ice_armor/_/re-given", + "asset:effect/0235.elec_armor/_/re-given", + "asset:effect/0238.raimei/_/re-given", + "asset:effect/0239.thorn_armor/_/re-given", + "asset:effect/0240.bless_of_deep_sea_coral/_/re-given", + "asset:effect/0243.oblivious_snow/_/re-given", + "asset:effect/0244.aurora_armor/_/re-given", + "asset:effect/0245.flame_hunter_attire/_/re-given", + "asset:effect/0246.flame_devil_armor/_/re-given", + "asset:effect/0247.great_demon_armor/_/re-given", "asset:effect/0260.life_steal/_/re-given", "asset:effect/0604.logging_of_soul/_/re-given", "asset:effect/0605.aurora_corrosion/_/re-given", diff --git a/Asset/data/asset/tags/functions/effect/register.json b/Asset/data/asset/tags/functions/effect/register.json index 5369f5fe28..86f7a06142 100644 --- a/Asset/data/asset/tags/functions/effect/register.json +++ b/Asset/data/asset/tags/functions/effect/register.json @@ -21,6 +21,22 @@ "asset:effect/0229.sapphirus_resonance/_/register", "asset:effect/0230.farothdal/_/register", "asset:effect/0231.wandering_dream/_/register", + "asset:effect/0232.soul_fire/_/register", + "asset:effect/0233.flame_armor/_/register", + "asset:effect/0234.ice_armor/_/register", + "asset:effect/0235.elec_armor/_/register", + "asset:effect/0236.solitariness/_/register", + "asset:effect/0237.heartland/_/register", + "asset:effect/0238.raimei/_/register", + "asset:effect/0239.thorn_armor/_/register", + "asset:effect/0240.bless_of_deep_sea_coral/_/register", + "asset:effect/0241.all_night/_/register", + "asset:effect/0242.catastrophe/_/register", + "asset:effect/0243.oblivious_snow/_/register", + "asset:effect/0244.aurora_armor/_/register", + "asset:effect/0245.flame_hunter_attire/_/register", + "asset:effect/0246.flame_devil_armor/_/register", + "asset:effect/0247.great_demon_armor/_/register", "asset:effect/0248.oracle_physical_attack/_/register", "asset:effect/0249.oracle_physical_defense/_/register", "asset:effect/0250.oracle_magic_attack/_/register", diff --git a/Asset/data/asset/tags/functions/effect/remove.json b/Asset/data/asset/tags/functions/effect/remove.json index 505112d8a8..7f5d57e761 100644 --- a/Asset/data/asset/tags/functions/effect/remove.json +++ b/Asset/data/asset/tags/functions/effect/remove.json @@ -16,6 +16,17 @@ "asset:effect/0221.hunters_run/_/remove", "asset:effect/0230.farothdal/_/remove", "asset:effect/0231.wandering_dream/_/remove", + "asset:effect/0232.soul_fire/_/remove", + "asset:effect/0233.flame_armor/_/remove", + "asset:effect/0234.ice_armor/_/remove", + "asset:effect/0235.elec_armor/_/remove", + "asset:effect/0238.raimei/_/remove", + "asset:effect/0240.bless_of_deep_sea_coral/_/remove", + "asset:effect/0243.oblivious_snow/_/remove", + "asset:effect/0245.flame_hunter_attire/_/remove", + "asset:effect/0240.bless_of_deep_sea_coral/_/remove", + "asset:effect/0243.oblivious_snow/_/remove", + "asset:effect/0245.flame_hunter_attire/_/remove", "asset:effect/0248.oracle_physical_attack/_/remove", "asset:effect/0249.oracle_physical_defense/_/remove", "asset:effect/0250.oracle_magic_attack/_/remove", diff --git a/Asset/data/asset/tags/functions/effect/tick.json b/Asset/data/asset/tags/functions/effect/tick.json index b0514bc987..8d74b9b895 100644 --- a/Asset/data/asset/tags/functions/effect/tick.json +++ b/Asset/data/asset/tags/functions/effect/tick.json @@ -14,6 +14,14 @@ "asset:effect/0228.rubeus_resonance/_/tick", "asset:effect/0229.sapphirus_resonance/_/tick", "asset:effect/0231.wandering_dream/_/tick", + "asset:effect/0232.soul_fire/_/tick", + "asset:effect/0237.heartland/_/tick", + "asset:effect/0238.raimei/_/tick", + "asset:effect/0239.thorn_armor/_/tick", + "asset:effect/0240.bless_of_deep_sea_coral/_/tick", + "asset:effect/0243.oblivious_snow/_/tick", + "asset:effect/0244.aurora_armor/_/tick", + "asset:effect/0247.great_demon_armor/_/tick", "asset:effect/0248.oracle_physical_attack/_/tick", "asset:effect/0249.oracle_physical_defense/_/tick", "asset:effect/0250.oracle_magic_attack/_/tick", diff --git a/Asset/data/asset/tags/functions/rejoin.json b/Asset/data/asset/tags/functions/rejoin.json index 45b999fb4f..7b34b3c177 100644 --- a/Asset/data/asset/tags/functions/rejoin.json +++ b/Asset/data/asset/tags/functions/rejoin.json @@ -1,65 +1,61 @@ { "values": [ - "asset:artifact/1024.brave_rod/trigger/rejoin_process", - "asset:artifact/0837.the_world_knife/trigger/rejoin_process", - "asset:artifact/0600.xtal/trigger/rejoin_process", + "asset:artifact/0033.magic_shield/trigger/rejoin_process", + "asset:artifact/0035.malleus_maleficarum/trigger/rejoin_process", + "asset:artifact/0077.swords_of_waterfall_climbing/trigger/rejoin_process", + "asset:artifact/0078.self_destruct_order/trigger/rejoin_process", "asset:artifact/0105.secret_meat/trigger/rejoin_process", - "asset:artifact/0664.soul_fire_armor/trigger/rejoin_process", - "asset:artifact/0643.raimei_chestplate/trigger/rejoin_process", - "asset:artifact/1048.thunder_storm/trigger/rejoin_process", - "asset:artifact/1045.mini_black_hole/trigger/rejoin_process", - "asset:artifact/1079.allochromatic/trigger/rejoin_process", - "asset:artifact/1078.pigeon_blood/trigger/rejoin_process", - "asset:artifact/0987.ghost_step/trigger/rejoin_process", - "asset:artifact/0769.shaking_splash/trigger/rejoin_process", - "asset:artifact/0758.sina_tk/trigger/rejoin_process", - "asset:artifact/0737.summer_festival_of_remembrance/trigger/rejoin_process", + "asset:artifact/0172.icicle/trigger/rejoin_process", + "asset:artifact/0210.terra_blade/trigger/rejoin_process", + "asset:artifact/0261.holy_symbol_lv.1/trigger/rejoin_process", + "asset:artifact/0265.holy_symbol_lv.5/trigger/rejoin_process", + "asset:artifact/0269.holy_symbol_lv.10/trigger/rejoin_process", + "asset:artifact/0295.call_elemental_familiar/trigger/rejoin_process", + "asset:artifact/0369.fire_magic/trigger/rejoin_process", + "asset:artifact/0373.ice_sorcery/trigger/rejoin_process", + "asset:artifact/0431.weather_lock_cane/trigger/rejoin_process", + "asset:artifact/0456.potion_of_stalling_power/trigger/rejoin_process", + "asset:artifact/0600.xtal/trigger/rejoin_process", + "asset:artifact/0606.traffic_sign/trigger/rejoin_process", + "asset:artifact/0609.lunar_flare/trigger/rejoin_process", + "asset:artifact/0610.call_fish/trigger/rejoin_process", "asset:artifact/0724.oblivious_snow/trigger/rejoin_process", - "asset:artifact/0787.aurora_helm/trigger/rejoin_process", - "asset:artifact/0711.deep_sea_coral_crown/trigger/rejoin_process", "asset:artifact/0730.lake_reflecting_starry_sky/trigger/rejoin_process", + "asset:artifact/0737.summer_festival_of_remembrance/trigger/rejoin_process", "asset:artifact/0738.voltage_striker/trigger/rejoin_process", - "asset:artifact/0606.traffic_sign/trigger/rejoin_process", - "asset:artifact/1033.thelema_of_blue_sea/trigger/rejoin_process", - "asset:artifact/1043.gamma_ray/trigger/rejoin_process", - "asset:artifact/1037.grand_flame/trigger/rejoin_process", - "asset:artifact/1034.eiya/trigger/rejoin_process", - "asset:artifact/0985.ark_of_the_sanctuary/trigger/rejoin_process", - "asset:artifact/0647.thorn_armor/trigger/rejoin_process", - "asset:artifact/0976.brave_sword/trigger/rejoin_process", - "asset:artifact/0953.meteor_rain/trigger/rejoin_process", - "asset:artifact/0981.soulfire_burst/trigger/rejoin_process", - "asset:artifact/0295.call_elemental_familiar/trigger/rejoin_process", - "asset:artifact/0973.call_rod_spirit/trigger/rejoin_process", - "asset:mob/0120.convict/rejoin_process", - "asset:artifact/0172.icicle/trigger/rejoin_process", + "asset:artifact/0758.sina_tk/trigger/rejoin_process", + "asset:artifact/0769.shaking_splash/trigger/rejoin_process", + "asset:artifact/0787.aurora_helm/trigger/rejoin_process", "asset:artifact/0793.queen_bee_rocket/trigger/rejoin_process", - "asset:artifact/0870.samurai_blade/trigger/rejoin_process", - "asset:artifact/0920.dal_i_thalion/trigger/rejoin_process", "asset:artifact/0822.sound_of_a_star/trigger/rejoin_process", - "asset:artifact/0431.weather_lock_cane/trigger/rejoin_process", - "asset:mob/0262.frestchika/rejoin_process", + "asset:artifact/0837.the_world_knife/trigger/rejoin_process", + "asset:artifact/0870.samurai_blade/trigger/rejoin_process", "asset:artifact/0905.book_of_metastasis/trigger/rejoin_process", "asset:artifact/0907.rod_of_rain/trigger/rejoin_process", - "asset:mob/0217.medousa_eye/rejoin_process", - "asset:mob/1008.yellow_star/rejoin_process", - "asset:mob/1005.blue_star/rejoin_process", - "asset:mob/1004.tultaria/rejoin_process", - "asset:artifact/0609.lunar_flare/trigger/rejoin_process", - "asset:artifact/0369.fire_magic/trigger/rejoin_process", - "asset:artifact/0210.terra_blade/trigger/rejoin_process", - "asset:artifact/0035.malleus_maleficarum/trigger/rejoin_process", - "asset:artifact/0033.magic_shield/trigger/rejoin_process", - "asset:artifact/0077.swords_of_waterfall_climbing/trigger/rejoin_process", - "asset:artifact/0078.self_destruct_order/trigger/rejoin_process", - "asset:artifact/0456.potion_of_stalling_power/trigger/rejoin_process", + "asset:artifact/0920.dal_i_thalion/trigger/rejoin_process", + "asset:artifact/0953.meteor_rain/trigger/rejoin_process", + "asset:artifact/0973.call_rod_spirit/trigger/rejoin_process", + "asset:artifact/0976.brave_sword/trigger/rejoin_process", + "asset:artifact/0981.soulfire_burst/trigger/rejoin_process", + "asset:artifact/0985.ark_of_the_sanctuary/trigger/rejoin_process", + "asset:artifact/0987.ghost_step/trigger/rejoin_process", + "asset:artifact/1024.brave_rod/trigger/rejoin_process", + "asset:artifact/1033.thelema_of_blue_sea/trigger/rejoin_process", + "asset:artifact/1034.eiya/trigger/rejoin_process", + "asset:artifact/1037.grand_flame/trigger/rejoin_process", + "asset:artifact/1043.gamma_ray/trigger/rejoin_process", + "asset:artifact/1045.mini_black_hole/trigger/rejoin_process", + "asset:artifact/1048.thunder_storm/trigger/rejoin_process", + "asset:artifact/1078.pigeon_blood/trigger/rejoin_process", + "asset:artifact/1079.allochromatic/trigger/rejoin_process", + "asset:mob/0120.convict/rejoin_process", "asset:mob/0129.lexiel/rejoin_process", - "asset:artifact/0261.holy_symbol_lv.1/trigger/rejoin_process", - "asset:artifact/0265.holy_symbol_lv.5/trigger/rejoin_process", - "asset:artifact/0269.holy_symbol_lv.10/trigger/rejoin_process", - "asset:artifact/0373.ice_sorcery/trigger/rejoin_process", + "asset:mob/0131.haruclaire/rejoin_process", "asset:mob/0151.recombined/rejoin_process", - "asset:artifact/0610.call_fish/trigger/rejoin_process", - "asset:mob/0131.haruclaire/rejoin_process" + "asset:mob/0217.medousa_eye/rejoin_process", + "asset:mob/0262.frestchika/rejoin_process", + "asset:mob/1004.tultaria/rejoin_process", + "asset:mob/1005.blue_star/rejoin_process", + "asset:mob/1008.yellow_star/rejoin_process" ] }