♻️ セット装備神器のリワーク

.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 (オプション)",

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
+    function asset:artifact/common/give

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
+    function asset:artifact/common/give

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
+    function asset:artifact/common/give

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
+    function asset:artifact/common/give

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
+    function asset:artifact/common/give

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
+    function asset:artifact/common/give

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
+    function asset:artifact/common/give

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
+    function asset:artifact/common/give

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
+    execute if entity @s[tag=CanUsed] run function asset:artifact/0535.all_night_chestplate/trigger/3.main

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
+    function api:heal/reset

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

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