From d331ae1f6ffef94fa57ed82315e7d83e00fc44b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=AF=E3=81=84=E3=81=84=E3=82=8D?= Date: Sat, 23 Nov 2024 23:47:40 +0900 Subject: [PATCH] =?UTF-8?q?:bug:=20=E4=BF=A1=E4=BB=B0=E5=A4=89=E6=9B=B4?= =?UTF-8?q?=E6=99=82=E3=81=AB=E8=A3=85=E5=82=99=E3=83=87=E3=83=BC=E3=82=BF?= =?UTF-8?q?=E3=81=8C=E6=9B=B4=E6=96=B0=E3=81=95=E3=82=8C=E3=81=AA=E3=81=84?= =?UTF-8?q?=E3=81=AE=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../asset_manager/functions/artifact/triggers/.mcfunction | 4 ++++ .../update_attribute/extract_changes.mcfunction | 1 + .../artifact/triggers/event/use_item/reset.mcfunction | 1 + .../data/player_manager/functions/god/_index.d.mcfunction | 8 ++++++++ .../player_manager/functions/god/flora/believe.mcfunction | 5 ++++- .../player_manager/functions/god/none/set_tag.mcfunction | 3 ++- .../functions/god/nyaptov/believe.mcfunction | 3 +++ .../player_manager/functions/god/rumor/believe.mcfunction | 5 ++++- .../player_manager/functions/god/urban/believe.mcfunction | 3 +++ .../player_manager/functions/god/wi-ki/believe.mcfunction | 3 +++ 10 files changed, 33 insertions(+), 3 deletions(-) diff --git a/TheSkyBlessing/data/asset_manager/functions/artifact/triggers/.mcfunction b/TheSkyBlessing/data/asset_manager/functions/artifact/triggers/.mcfunction index f299adfb0a..ccef59b151 100644 --- a/TheSkyBlessing/data/asset_manager/functions/artifact/triggers/.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/artifact/triggers/.mcfunction @@ -20,6 +20,10 @@ execute if data storage asset:artifact {EquipmentChanges:[{_:{_:false}}]} run function asset_manager:artifact/triggers/equipments/update_attribute/ execute if data storage asset:artifact {EquipmentChanges:[{_:{_:false}}]} if entity @s[tag=TriggerFlag.Sneak] run function asset_manager:artifact/triggers/event/sneak/reset_when_change_item execute if data storage asset:artifact {EquipmentChanges:[{_:{_:false}}]} if entity @s[tag=TriggerFlag.UsingItem] run function asset_manager:artifact/triggers/event/use_item/reset_when_change_item +# 改宗時の更新処理 + execute if entity @s[tag=Believe.Changed] unless data storage asset:artifact {EquipmentChanges:[{_:{_:false}}]} run function asset_manager:artifact/triggers/equipments/update_attribute/ + execute if entity @s[tag=Believe.Changed] unless data storage asset:artifact {EquipmentChanges:[{_:{_:false}}]} run function asset_manager:artifact/triggers/event/sneak/reset + execute if entity @s[tag=Believe.Changed] unless data storage asset:artifact {EquipmentChanges:[{_:{_:false}}]} run function asset_manager:artifact/triggers/event/use_item/reset # 各神器にトリガー受けわたし function asset_manager:artifact/triggers/trigger/ # EntityStorageにデータ突っ込む diff --git a/TheSkyBlessing/data/asset_manager/functions/artifact/triggers/equipments/update_attribute/extract_changes.mcfunction b/TheSkyBlessing/data/asset_manager/functions/artifact/triggers/equipments/update_attribute/extract_changes.mcfunction index 461bc9e191..a18618ec8b 100644 --- a/TheSkyBlessing/data/asset_manager/functions/artifact/triggers/equipments/update_attribute/extract_changes.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/artifact/triggers/equipments/update_attribute/extract_changes.mcfunction @@ -8,6 +8,7 @@ # EquipIDは必要なのでlib:array/maskは使わない # 改宗時は問答無用で通すようにする data modify storage asset:artifact Mask set from storage asset:artifact CopiedChanges[-1]._._ + execute if entity @s[tag=Believe.Changed] run data modify storage asset:artifact Mask set value false data modify storage asset:artifact Old.MaskedItemData append from storage asset:artifact Old.CopiedItemData[-1] execute unless data storage asset:artifact Old.MaskedItemData[-1].EquipID run data modify storage asset:artifact Old.MaskedItemData[-1].EquipID set value -2 execute if data storage asset:artifact Old.MaskedItemData[-1].Modifiers[0] run data modify storage asset:artifact Old.MaskedItemData[-1].Modifiers[].ID set from storage asset:artifact Old.CopiedItemData[-1].ID diff --git a/TheSkyBlessing/data/asset_manager/functions/artifact/triggers/event/use_item/reset.mcfunction b/TheSkyBlessing/data/asset_manager/functions/artifact/triggers/event/use_item/reset.mcfunction index 25e00c0f0e..4f8214f5f3 100644 --- a/TheSkyBlessing/data/asset_manager/functions/artifact/triggers/event/use_item/reset.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/artifact/triggers/event/use_item/reset.mcfunction @@ -3,6 +3,7 @@ # # # @within function +# asset_manager:artifact/triggers/ # asset_manager:artifact/triggers/trigger/ # asset_manager:artifact/triggers/use_item/ diff --git a/TheSkyBlessing/data/player_manager/functions/god/_index.d.mcfunction b/TheSkyBlessing/data/player_manager/functions/god/_index.d.mcfunction index d1f7908e5c..9fe6b46281 100644 --- a/TheSkyBlessing/data/player_manager/functions/god/_index.d.mcfunction +++ b/TheSkyBlessing/data/player_manager/functions/god/_index.d.mcfunction @@ -17,3 +17,11 @@ #> storage for process # @within function player_manager:god/mercy/** #declare storage player_manager:god + +#> Tag for Equipment Update +# @within function +# player_manager:god/*/believe +# player_manager:god/none/set_tag +# asset_manager:artifact/triggers/ +# asset_manager:artifact/triggers/equipments/update_attribute/* + #declare tag Believe.Changed diff --git a/TheSkyBlessing/data/player_manager/functions/god/flora/believe.mcfunction b/TheSkyBlessing/data/player_manager/functions/god/flora/believe.mcfunction index 8fb693119b..97c285d6c0 100644 --- a/TheSkyBlessing/data/player_manager/functions/god/flora/believe.mcfunction +++ b/TheSkyBlessing/data/player_manager/functions/god/flora/believe.mcfunction @@ -22,4 +22,7 @@ data modify storage api: Argument.UUID set value [2, 1, 1, 10] data modify storage api: Argument.Amount set value -0.2 data modify storage api: Argument.Operation set value "multiply_base" - function api:modifier/defense/fire/add \ No newline at end of file + function api:modifier/defense/fire/add + +# 全装備を再チェック + tag @s add Believe.Changed diff --git a/TheSkyBlessing/data/player_manager/functions/god/none/set_tag.mcfunction b/TheSkyBlessing/data/player_manager/functions/god/none/set_tag.mcfunction index f02c670ee4..090eb3a1a2 100644 --- a/TheSkyBlessing/data/player_manager/functions/god/none/set_tag.mcfunction +++ b/TheSkyBlessing/data/player_manager/functions/god/none/set_tag.mcfunction @@ -4,4 +4,5 @@ # # @within function core:handler/first_join -tag @s add Believe.None \ No newline at end of file +tag @s add Believe.None +tag @s add Believe.Changed diff --git a/TheSkyBlessing/data/player_manager/functions/god/nyaptov/believe.mcfunction b/TheSkyBlessing/data/player_manager/functions/god/nyaptov/believe.mcfunction index b37b6d6e67..5894ffbf15 100644 --- a/TheSkyBlessing/data/player_manager/functions/god/nyaptov/believe.mcfunction +++ b/TheSkyBlessing/data/player_manager/functions/god/nyaptov/believe.mcfunction @@ -28,3 +28,6 @@ data modify storage api: Argument.Amount set value 1 data modify storage api: Argument.Operation set value "multiply_base" function api:modifier/fall_damage/add + +# 全装備を再チェック + tag @s add Believe.Changed diff --git a/TheSkyBlessing/data/player_manager/functions/god/rumor/believe.mcfunction b/TheSkyBlessing/data/player_manager/functions/god/rumor/believe.mcfunction index 0ff462ceae..da46450bb8 100644 --- a/TheSkyBlessing/data/player_manager/functions/god/rumor/believe.mcfunction +++ b/TheSkyBlessing/data/player_manager/functions/god/rumor/believe.mcfunction @@ -27,4 +27,7 @@ data modify storage api: Argument.UUID set value [2, 1, 1, 12] data modify storage api: Argument.Amount set value -0.1 data modify storage api: Argument.Operation set value "multiply_base" - function api:modifier/defense/base/add \ No newline at end of file + function api:modifier/defense/base/add + +# 全装備を再チェック + tag @s add Believe.Changed diff --git a/TheSkyBlessing/data/player_manager/functions/god/urban/believe.mcfunction b/TheSkyBlessing/data/player_manager/functions/god/urban/believe.mcfunction index 9a1c89b45c..c99ca1b7fb 100644 --- a/TheSkyBlessing/data/player_manager/functions/god/urban/believe.mcfunction +++ b/TheSkyBlessing/data/player_manager/functions/god/urban/believe.mcfunction @@ -28,3 +28,6 @@ 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 + +# 全装備を再チェック + tag @s add Believe.Changed diff --git a/TheSkyBlessing/data/player_manager/functions/god/wi-ki/believe.mcfunction b/TheSkyBlessing/data/player_manager/functions/god/wi-ki/believe.mcfunction index e280c1ef8c..415ef77835 100644 --- a/TheSkyBlessing/data/player_manager/functions/god/wi-ki/believe.mcfunction +++ b/TheSkyBlessing/data/player_manager/functions/god/wi-ki/believe.mcfunction @@ -33,3 +33,6 @@ data modify storage api: Argument.Amount set value -0.3 data modify storage api: Argument.Operation set value "multiply_base" function api:modifier/defense/fire/add + +# 全装備を再チェック + tag @s add Believe.Changed