Skip to content

Commit 227fa84

Browse files
haiiro2gouhaiiro2gou
committed
🐛 オフハンドが優先して処理される問題を修正
1 parent 27ca782 commit 227fa84

File tree

4 files changed

+23
-19
lines changed

4 files changed

+23
-19
lines changed

‎TheSkyBlessing/data/asset_manager/functions/artifact/triggers/equipments/update_cooldown_type.mcfunction

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,30 +9,30 @@
99
# 配列に設定する
1010
data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].EquipmentCooldownTypes set value []
1111
data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].EquipmentCooldownTypes append value "unknown"
12-
data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].EquipmentCooldownTypes[-1] set from storage asset:artifact New.ItemData[01].TypeCooldown.Type
12+
data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].EquipmentCooldownTypes[-1] set from storage asset:artifact New.Items.offhand.tag.TSB.TypeCooldown.Type
1313
data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].EquipmentCooldownTypes append value "unknown"
14-
data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].EquipmentCooldownTypes[-1] set from storage asset:artifact New.ItemData[02].TypeCooldown.Type
14+
data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].EquipmentCooldownTypes[-1] set from storage asset:artifact New.Items.feet.tag.TSB.TypeCooldown.Type
1515
data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].EquipmentCooldownTypes append value "unknown"
16-
data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].EquipmentCooldownTypes[-1] set from storage asset:artifact New.ItemData[03].TypeCooldown.Type
16+
data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].EquipmentCooldownTypes[-1] set from storage asset:artifact New.Items.legs.tag.TSB.TypeCooldown.Type
1717
data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].EquipmentCooldownTypes append value "unknown"
18-
data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].EquipmentCooldownTypes[-1] set from storage asset:artifact New.ItemData[04].TypeCooldown.Type
18+
data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].EquipmentCooldownTypes[-1] set from storage asset:artifact New.Items.chest.tag.TSB.TypeCooldown.Type
1919
data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].EquipmentCooldownTypes append value "unknown"
20-
data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].EquipmentCooldownTypes[-1] set from storage asset:artifact New.ItemData[05].TypeCooldown.Type
20+
data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].EquipmentCooldownTypes[-1] set from storage asset:artifact New.Items.head.tag.TSB.TypeCooldown.Type
2121
data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].EquipmentCooldownTypes append value "unknown"
22-
data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].EquipmentCooldownTypes[-1] set from storage asset:artifact New.ItemData[06].TypeCooldown.Type
22+
data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].EquipmentCooldownTypes[-1] set from storage asset:artifact New.Items.hotbar[0].tag.TSB.TypeCooldown.Type
2323
data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].EquipmentCooldownTypes append value "unknown"
24-
data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].EquipmentCooldownTypes[-1] set from storage asset:artifact New.ItemData[07].TypeCooldown.Type
24+
data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].EquipmentCooldownTypes[-1] set from storage asset:artifact New.Items.hotbar[1].tag.TSB.TypeCooldown.Type
2525
data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].EquipmentCooldownTypes append value "unknown"
26-
data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].EquipmentCooldownTypes[-1] set from storage asset:artifact New.ItemData[08].TypeCooldown.Type
26+
data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].EquipmentCooldownTypes[-1] set from storage asset:artifact New.Items.hotbar[2].tag.TSB.TypeCooldown.Type
2727
data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].EquipmentCooldownTypes append value "unknown"
28-
data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].EquipmentCooldownTypes[-1] set from storage asset:artifact New.ItemData[09].TypeCooldown.Type
28+
data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].EquipmentCooldownTypes[-1] set from storage asset:artifact New.Items.hotbar[3].tag.TSB.TypeCooldown.Type
2929
data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].EquipmentCooldownTypes append value "unknown"
30-
data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].EquipmentCooldownTypes[-1] set from storage asset:artifact New.ItemData[10].TypeCooldown.Type
30+
data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].EquipmentCooldownTypes[-1] set from storage asset:artifact New.Items.hotbar[4].tag.TSB.TypeCooldown.Type
3131
data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].EquipmentCooldownTypes append value "unknown"
32-
data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].EquipmentCooldownTypes[-1] set from storage asset:artifact New.ItemData[11].TypeCooldown.Type
32+
data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].EquipmentCooldownTypes[-1] set from storage asset:artifact New.Items.hotbar[5].tag.TSB.TypeCooldown.Type
3333
data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].EquipmentCooldownTypes append value "unknown"
34-
data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].EquipmentCooldownTypes[-1] set from storage asset:artifact New.ItemData[12].TypeCooldown.Type
34+
data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].EquipmentCooldownTypes[-1] set from storage asset:artifact New.Items.hotbar[6].tag.TSB.TypeCooldown.Type
3535
data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].EquipmentCooldownTypes append value "unknown"
36-
data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].EquipmentCooldownTypes[-1] set from storage asset:artifact New.ItemData[13].TypeCooldown.Type
36+
data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].EquipmentCooldownTypes[-1] set from storage asset:artifact New.Items.hotbar[7].tag.TSB.TypeCooldown.Type
3737
data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].EquipmentCooldownTypes append value "unknown"
38-
data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].EquipmentCooldownTypes[-1] set from storage asset:artifact New.ItemData[14].TypeCooldown.Type
38+
data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].EquipmentCooldownTypes[-1] set from storage asset:artifact New.Items.hotbar[8].tag.TSB.TypeCooldown.Type

‎TheSkyBlessing/data/asset_manager/functions/artifact/triggers/trigger/.mcfunction

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,12 @@
2626
data modify storage asset:artifact New.CopiedItemData set from storage lib: Array
2727
function lib:array/session/close
2828
# データを扱いやすくする
29+
function lib:array/session/open
2930
scoreboard players set $SlotIndex Temporary -6
3031
function asset_manager:artifact/triggers/trigger/normalize/
32+
function lib:array/reverse
33+
data modify storage asset:artifact NormalizedItemData set from storage lib: Array
34+
function lib:array/session/close
3135
# 各神器ごとに処理を実行する
3236
execute if data storage asset:artifact NormalizedItemData[0] run function asset_manager:artifact/triggers/trigger/foreach/
3337

‎TheSkyBlessing/data/asset_manager/functions/artifact/triggers/trigger/foreach/.mcfunction

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@
1212
# contextを設定
1313
data modify storage asset:context id set from storage asset:artifact TargetItem.ID
1414
data modify storage asset:context Slot set from storage asset:artifact TargetItem.TargetSlot
15-
data modify storage asset:context Trigger set from storage asset:artifact TargetItem.Trigger
1615

1716
# アイテムを消費中であることを登録する
1817
execute if data storage asset:artifact TargetItem{Trigger:"use_item"} unless data storage asset:artifact New.Consumable.ID if entity @s[tag=TriggerFlag.UsingItem,tag=!ConsumingItem] run function asset_manager:artifact/triggers/event/use_item/init
1918
execute if data storage asset:artifact TargetItem{Trigger:"shot"} unless data storage asset:artifact New.Consumable.ID if entity @s[tag=TriggerFlag.UsingItem,tag=!ConsumingItem] run function asset_manager:artifact/triggers/event/use_item/init
2019

2120
# トリガーを持っていれば処理を実行する
2221
# equipとuse_itemは別処理をしているので弾く
22+
data modify storage asset:context Trigger set from storage asset:artifact TargetItem.Trigger
2323
execute unless data storage asset:artifact TargetItem{Trigger:"equip"} unless data storage asset:artifact TargetItem{Trigger:"use_item"} run function asset_manager:artifact/triggers/trigger/foreach/call.m with storage asset:context
2424

2525
# リセット

‎TheSkyBlessing/data/asset_manager/functions/artifact/triggers/trigger/normalize/upsert.m.mcfunction

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@
1010
#declare score_holder $ExistsArtifact
1111

1212
# 同じidのデータがあるならまとめる
13-
$execute store result score $ExistsArtifact Temporary if data storage asset:artifact NormalizedItemData[{id:$(ID)}]
14-
$execute if score $ExistsArtifact Temporary matches 1.. run data modify storage asset:artifact NormalizedItemData[{id:$(ID)}]._ append from storage asset:artifact CopiedItem
13+
$execute store result score $ExistsArtifact Temporary if data storage lib: Array[{id:$(ID)}]
14+
$execute if score $ExistsArtifact Temporary matches 1.. run data modify storage lib: Array[{id:$(ID)}]._ append from storage asset:artifact CopiedItem
1515
# ないなら生成して放り込む
16-
$execute unless score $ExistsArtifact Temporary matches 1.. run data modify storage asset:artifact NormalizedItemData append value {id:$(ID),_:[]}
17-
execute unless score $ExistsArtifact Temporary matches 1.. run data modify storage asset:artifact NormalizedItemData[-1]._ append from storage asset:artifact CopiedItem
16+
$execute unless score $ExistsArtifact Temporary matches 1.. run data modify storage lib: Array append value {id:$(ID),_:[]}
17+
execute unless score $ExistsArtifact Temporary matches 1.. run data modify storage lib: Array[-1]._ append from storage asset:artifact CopiedItem
1818

1919
# リセット
2020
scoreboard players reset $ExistsArtifact Temporary

0 commit comments

Comments
 (0)