🧑‍💻 IgnoreItemUpdateを神器側の変数として登録するように

ProjectTSB · Dec 4, 2024 · af825de · af825de
1 parent 5da8bc1
commit af825de
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 1 deletion.
diff --git a/TheSkyBlessing/data/asset_manager/functions/artifact/create/set_data.mcfunction b/TheSkyBlessing/data/asset_manager/functions/artifact/create/set_data.mcfunction
@@ -24,6 +24,7 @@
 #       SpecialCooldown? : int
 #       DisableCooldownMessage? : boolean
 #       DisableMPMessage? : boolean
+#       IgnoreItemUpdate? : boolean
 #       DisableBreakSound? : boolean
 #       EquipID? : int
 #       Modifiers : Component[]
@@ -74,6 +75,7 @@
     data modify storage asset:artifact Item.tag.TSB.SpecialCooldown set from storage asset:artifact SpecialCooldown
     data modify storage asset:artifact Item.tag.TSB.DisableCooldownMessage set from storage asset:artifact DisableCooldownMessage
     data modify storage asset:artifact Item.tag.TSB.DisableMPMessage set from storage asset:artifact DisableMPMessage
+    data modify storage asset:artifact Item.tag.TSB.IgnoreItemUpdate set from storage asset:artifact IgnoreItemUpdate
     data modify storage asset:artifact Item.tag.TSB.DisableBreakSound set from storage asset:artifact DisableBreakSound
     data modify storage asset:artifact Item.tag.TSB.EquipID set from storage asset:artifact EquipID
     data modify storage asset:artifact Item.tag.TSB.Modifiers set from storage asset:artifact Modifiers

diff --git a/TheSkyBlessing/data/asset_manager/functions/artifact/give/.mcfunction b/TheSkyBlessing/data/asset_manager/functions/artifact/give/.mcfunction
@@ -23,6 +23,7 @@
 #   SpecialCooldown? : int
 #   DisableCooldownMessage? : boolean
 #   DisableMPMessage? : boolean
+#   IgnoreItemUpdate? : boolean
 #   DisableBreakSound? : boolean
 #   EquipID? : int
 #   Modifiers : Component[]
@@ -94,6 +95,7 @@
     data remove storage asset:artifact SpecialCooldown
     data remove storage asset:artifact DisableCooldownMessage
     data remove storage asset:artifact DisableMPMessage
+    data remove storage asset:artifact IgnoreItemUpdate
     data remove storage asset:artifact DisableBreakSound
     data remove storage asset:artifact EquipID
     data remove storage asset:artifact Modifiers

diff --git a/TheSkyBlessing/data/asset_manager/functions/artifact/give/validate/trigger.mcfunction b/TheSkyBlessing/data/asset_manager/functions/artifact/give/validate/trigger.mcfunction
@@ -16,3 +16,4 @@ execute unless data storage asset:artifact MPCost unless data storage asset:arti
 # execute unless data storage asset:artifact SpecialCooldown run
 # execute unless data storage asset:artifact DisableCooldownMessage run
 # execute unless data storage asset:artifact DisableMPMessage run
+# execute unless data storage asset:artifact IgnoreItemUpdate run
diff --git a/TheSkyBlessing/data/asset_manager/functions/artifact/use/.mcfunction b/TheSkyBlessing/data/asset_manager/functions/artifact/use/.mcfunction
@@ -20,7 +20,7 @@
 # 対象アイテムの要素数を拾う
     execute store result score $OldItems Temporary if data storage asset:artifact TargetItemList[]
 # すべてのアイテムについて更新処理を行う
-    function asset_manager:artifact/use/item/
+    execute unless data storage asset:artifact TargetItem{IgnoreItemUpdate:true} run function asset_manager:artifact/use/item/
 # データを更新する
 # 要素数が変わっていれば一つ以上破壊されている
     execute store result score $NewItems Temporary if data storage asset:artifact RenewedItemList[]