Skip to content

Commit 6c923b3

Browse files
haiiro2gouhaiiro2gou
committed
Merge branch 'master' into rework/haiiro_artifact-trigger
2 parents 94ff391 + a271ac4 commit 6c923b3

File tree

72 files changed

+403
-238
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+403
-238
lines changed

‎TheSkyBlessing/data/api/functions/damage/core/attack.mcfunction

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,13 @@
1010
function api:damage/core/get_status/
1111
# 与えるダメージの計算
1212
function api:damage/core/calc/
13+
# ダメージの補正
14+
execute if data storage api: Argument{BypassModifier:false} store result storage api: Damage double 0.0001 run scoreboard players get $Damage Temporary
15+
execute if data storage api: Argument{BypassModifier:false} run function api:damage/core/modify_damage.m {Side:"Defense"}
16+
execute if data storage api: Argument{BypassModifier:false} store result score $Damage Temporary run data get storage api: ModifiedDamage 100
17+
execute if data storage api: Argument{BypassModifier: true} run scoreboard players operation $Damage Temporary /= $100 Const
18+
# システム的なダメージ上限(9999.9/99999999(e4))チェック
19+
execute if score $Damage Temporary matches 99999000.. run scoreboard players set $Damage Temporary 99999000
1320
# Mobに適用
1421
function api:damage/core/health_subtract/
1522
# リセット

‎TheSkyBlessing/data/api/functions/damage/core/calc/.mcfunction

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,9 @@
2121
execute if score $Resistance Temporary matches 1.. run function api:damage/core/calc/resistance
2222
# エンチャントによる軽減計算部
2323
execute if score $EPF Temporary matches 1.. run function api:damage/core/calc/enchantment
24-
# システム的なダメージ上限(9999.9/99999999(e4))チェック
25-
execute if score $Damage Temporary matches 99999000.. run scoreboard players set $Damage Temporary 99999000
2624
# Reset
2725
scoreboard players reset $isDefenseCalcSkip Temporary
2826
scoreboard players reset $defensePoints Temporary
2927
scoreboard players reset $toughness Temporary
3028
scoreboard players reset $EPF Temporary
31-
scoreboard players reset $Resistance Temporary
29+
scoreboard players reset $Resistance Temporary

‎TheSkyBlessing/data/api/functions/damage/core/get_status/.mcfunction

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,8 @@
66

77
# 体力
88
execute if entity @s[type=!player] store result score $Health Temporary run scoreboard players get @s MobHealth
9-
# ダメージ
10-
execute if data storage api: Argument{BypassModifier:false} run function api:damage/core/get_status/modify_and_get_damage
11-
execute if data storage api: Argument{BypassModifier: true} store result score $Damage Temporary run data get storage api: Argument.Damage 100
9+
# ダメージを取得
10+
execute store result score $Damage Temporary run data get storage api: Argument.Damage 100
1211
# 防御力
1312
execute if data storage api: Argument{BypassArmorDefense:false} store result score $defensePoints Temporary run attribute @s generic.armor get 100
1413
execute if data storage api: Argument{BypassArmorDefense: true} run scoreboard players set $defensePoints Temporary 0

‎TheSkyBlessing/data/api/functions/damage/core/get_status/modify_and_get_damage.mcfunction

Lines changed: 0 additions & 13 deletions
This file was deleted.

‎TheSkyBlessing/data/api/functions/damage/core/health_subtract/non-player/.mcfunction

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@
99
#declare score_holder $Fluctuation
1010
#declare tag UUIDAttacker
1111

12-
# ダメージ量を補正
13-
scoreboard players operation $Damage Temporary /= $100 Const
1412
# ダメージ表示
1513
scoreboard players set $Fluctuation Lib 0
1614
scoreboard players operation $Fluctuation Lib -= $Damage Temporary

‎TheSkyBlessing/data/api/functions/damage/core/health_subtract/player/.mcfunction

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,7 @@
77
# 難易度補正を掛ける
88
execute if data storage api: Argument{BypassDifficulty:false} run function api:damage/core/health_subtract/player/difficulty_modifier
99
# 引数として代入
10-
execute store result storage api: Argument.Fluctuation double -0.0001 run scoreboard players get $Damage Temporary
11-
execute store result storage api: Argument.Attacker int 1 run scoreboard players get $LatestModifiedEntity MobUUID
12-
# data modify storage api: Argument.AttackType set from storage api: Argument.AttackType
13-
# data modify storage api: Argument.ElementType set from storage api: Argument.ElementType
14-
# data modify storage api: Argument.DisableLog set from storage api: Argument.DisableLog
10+
execute store result storage api: Argument.Fluctuation double -0.01 run scoreboard players get $Damage Temporary
1511
# onAttackのトリガー
1612
function api:damage/core/trigger_events/player/attack_and_damage/
1713
# 体力の減少を反映させる

‎TheSkyBlessing/data/api/functions/damage/core/modify/non-player.mcfunction

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,7 @@
66

77
# 攻撃者情報の記録
88
scoreboard players operation $LatestModifiedEntity MobUUID = @s MobUUID
9+
execute store result storage api: Argument.Attacker int 1 run scoreboard players get @s MobUUID
10+
data modify storage api: Argument.AttackerType set value "non-player"
911
# ModifierIndex をインクリメントする
1012
scoreboard players add $ModifierIndex Global 1

‎TheSkyBlessing/data/api/functions/damage/core/modify/non-player_manual.mcfunction

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,7 @@
66

77
# 攻撃者情報の記録
88
execute store result score $LatestModifiedEntity MobUUID run data get storage api: Argument.MobUUID
9+
execute store result storage api: Argument.Attacker int 1 run data get storage api: Argument.MobUUID
10+
data modify storage api: Argument.AttackerType set value "non-player"
911
# ModifierIndex をインクリメントする
1012
scoreboard players add $ModifierIndex Global 1

‎TheSkyBlessing/data/api/functions/damage/core/modify/player.mcfunction

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,13 @@
66

77
# プレイヤー情報の記録
88
scoreboard players operation $LatestModifiedUser UserID = @s UserID
9+
execute store result storage api: Argument.Attacker int 1 run scoreboard players get @s UserID
10+
data modify storage api: Argument.AttackerType set value "player"
911
# ModifierIndex をインクリメントする
1012
scoreboard players add $ModifierIndex Global 1
1113
# ダメージに補正値を掛ける
12-
execute if data storage api: Argument{BypassModifier:false} run function oh_my_dat:please
13-
execute if data storage api: Argument{BypassModifier:false} run data modify storage api: Modifiers set from storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].Attributes.Value.Attack
14-
execute if data storage api: Argument{BypassModifier:false} run function api:damage/core/modify_damage
14+
execute if data storage api: Argument{BypassModifier:false} run data modify storage api: Damage set from storage api: Argument.Damage
15+
execute if data storage api: Argument{BypassModifier:false} run function api:damage/core/modify_damage.m {Side:"Attack"}
1516
execute if data storage api: Argument{BypassModifier:false} run data modify storage api: Argument.Damage set from storage api: ModifiedDamage
1617
# リセット
1718
data remove storage api: ModifiedDamage

‎TheSkyBlessing/data/api/functions/damage/core/modify_damage.mcfunction renamed to ‎TheSkyBlessing/data/api/functions/damage/core/modify_damage.m.mcfunction

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
1-
#> api:damage/core/modify_damage
1+
#> api:damage/core/modify_damage.m
22
#
33
# ダメージをapi: Modifiersを元に補正します
44
#
5+
# @input args
6+
# Side : "Attack" | "Defense"
57
# @within function
68
# api:damage/core/modify/player
7-
# api:damage/core/get_status/modify_and_get_damage
9+
# api:damage/core/attack
810

911
#> Temp
1012
# @private
@@ -16,7 +18,11 @@
1618

1719
# 必要なデータの取得と加算
1820
# 元ダメージ
19-
execute store result score $Damage Temporary run data get storage api: Argument.Damage 100
21+
execute store result score $Damage Temporary run data get storage api: Damage 100
22+
# 補正
23+
function oh_my_dat:please
24+
$data modify storage api: Modifiers set from storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].Attributes.Value.$(Side)
25+
# 補正値の計算
2026
# Base値による補正
2127
execute store result score $Modifier Temporary run data get storage api: Modifiers.Base 100
2228
execute unless data storage api: Modifiers.Base run scoreboard players set $Modifier Temporary 100
@@ -53,6 +59,7 @@
5359
# 代入
5460
execute store result storage api: ModifiedDamage double 0.0001 run scoreboard players get $Damage Temporary
5561
# リセット
62+
data remove storage api: Damage
5663
data remove storage api: Modifiers
5764
scoreboard players reset $Damage Temporary
5865
scoreboard players reset $Modifier Temporary

‎TheSkyBlessing/data/api/functions/damage/core/reset.mcfunction

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
data remove storage api: Argument.Damage
88
data remove storage api: Argument.AttackType
99
data remove storage api: Argument.ElementType
10+
data remove storage api: Argument.Attacker
11+
data remove storage api: Argument.AttackerType
1012
data remove storage api: Argument.DeathMessage
1113
data remove storage api: Argument.FixedDamage
1214
data remove storage api: Argument.BypassModifier

‎TheSkyBlessing/data/api/functions/damage/modifier.mcfunction

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,5 +29,5 @@
2929
# 補正フラグを立てる
3030
data modify storage api: DamageLibModified set value true
3131
# 補正
32-
execute if entity @s[type=player] run function api:damage/core/modify/player
32+
execute if entity @s[type= player] run function api:damage/core/modify/player
3333
execute if entity @s[type=!player] run function api:damage/core/modify/non-player

‎TheSkyBlessing/data/api/functions/entity/mob/effect/core/give.mcfunction

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,9 @@
2121
execute unless data storage asset:effect DurationOperation run data modify storage asset:effect DurationOperation set from storage api: Argument.DurationOperation
2222
execute unless data storage asset:effect StackOperation run data modify storage asset:effect StackOperation set from storage api: Argument.StackOperation
2323
# デフォルト値
24+
execute unless data storage asset:effect Visible run data modify storage asset:effect Visible set value true
2425
execute unless data storage asset:effect Stack run data modify storage asset:effect Stack set value 1
26+
execute unless data storage asset:effect StackVisible run data modify storage asset:effect StackVisible set value true
2527
execute unless data storage asset:effect DurationOperation run data modify storage asset:effect DurationOperation set value "replace"
2628
execute unless data storage asset:effect StackOperation run data modify storage asset:effect StackOperation set value "replace"
2729
execute unless data storage asset:effect MaxDuration run data modify storage asset:effect MaxDuration set value 2147483647
@@ -42,7 +44,9 @@
4244
data remove storage asset:effect Name
4345
data remove storage asset:effect Description
4446
data remove storage asset:effect Duration
47+
data remove storage asset:effect Visible
4548
data remove storage asset:effect Stack
49+
data remove storage asset:effect StackVisible
4650
data remove storage asset:effect DurationOperation
4751
data remove storage asset:effect StackOperation
4852
data remove storage asset:effect MaxDuration

‎TheSkyBlessing/data/api/functions/mp/check.mcfunction

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
#declare score_holder $CheckMP
1616

1717
# 閾値を取得
18-
execute store result score $CheckMP Temporary run data get storage api: Argument.Threshold
18+
execute store result score $CheckMP Temporary run data get storage api: Argument.Threshold 10
1919
# Bypass
2020
execute if entity @s[tag=DevPrivilege] run scoreboard players set $CheckMP Temporary 0
2121
# チェック
2222
execute store success storage api: Return.IsThresholdOrMore byte 1 if score $CheckMP Temporary <= @s MP
2323
# リセット
24-
scoreboard players reset $CheckMP Temporary
24+
scoreboard players reset $CheckMP Temporary

‎TheSkyBlessing/data/api/functions/mp/fluctuation.mcfunction

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,15 @@
1313
#declare score_holder $Fluctuation
1414

1515
# 増減量取得
16-
execute store result score $Fluctuation Lib run data get storage api: Argument.Fluctuation
16+
execute store result score $Fluctuation Temporary run data get storage api: Argument.Fluctuation 10
1717
# 増減
18-
scoreboard players operation @s MP += $Fluctuation Lib
18+
scoreboard players operation @s MP += $Fluctuation Temporary
1919
scoreboard players operation @s MP > $0 Const
2020
scoreboard players operation @s MP < @s MPMax
2121
# 表示
22+
scoreboard players operation $Fluctuation Temporary /= $10 Const
2223
execute unless data storage api: Argument{DisableLog:1b} at @s run function lib:status_log/show_mp
2324
# リセット
24-
scoreboard players reset $Fluctuation Lib
25+
scoreboard players reset $Fluctuation Temporary
2526
data remove storage api: Argument.Fluctuation
2627
data remove storage api: Argument.DisableLog

‎TheSkyBlessing/data/api/functions/mp/get_current.mcfunction

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@
77
# @api
88

99
# 取得
10-
execute store result storage api: Return.CurrentMP int 1 run scoreboard players get @s MP
10+
execute store result storage api: Return.CurrentMP int 0.1 run scoreboard players get @s MP

‎TheSkyBlessing/data/api/functions/mp/get_max.mcfunction

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@
77
# @api
88

99
# 取得
10-
execute store result storage api: Return.MaxMP int 1 run scoreboard players get @s MPMax
10+
execute store result storage api: Return.MaxMP int 0.1 run scoreboard players get @s MPMax

‎TheSkyBlessing/data/api/functions/mp/set.mcfunction

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
#declare score_holder $MP
1313

1414
# 取得
15-
execute store result score $MP Temporary run data get storage api: Argument.MP
15+
execute store result score $MP Temporary run data get storage api: Argument.MP 10
1616
# セット
1717
scoreboard players operation @s MP = $MP Temporary
1818
# リセット
1919
scoreboard players reset $MP Temporary
20-
data remove storage api: Argument.MP
20+
data remove storage api: Argument.MP

‎TheSkyBlessing/data/api/functions/mp/update_max.mcfunction

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@
99
# Storage呼び出し
1010
function oh_my_dat:please
1111
# 最大MP変更
12-
execute store result score @s MPMax run data get storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].Attributes.Value.MaxMP 1
12+
execute store result score @s MPMax run data get storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].Attributes.Value.MaxMP 10
1313
scoreboard players operation @s MPMax > $0 Const

‎TheSkyBlessing/data/asset_manager/functions/artifact/_index.d.mcfunction

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
# asset:artifact/*/register
99
# asset:artifact/enum/**
1010
# asset_manager:artifact/**
11-
# player_manager:actionbar/
1211
#declare storage asset:artifact
1312

1413
#> 特殊クールダウン
@@ -57,6 +56,7 @@
5756
#declare tag Victim
5857
#declare tag Healer
5958
#declare tag Receiver
59+
#declare tag ShotArrow
6060

6161
#> セレクターテンプレート
6262
# @within * asset:artifact/**
@@ -75,6 +75,10 @@
7575
#declare score_holder $Max
7676
#declare score_holder $LatestUsedTick
7777

78+
#> 矢検知
79+
# @within function asset_manager:artifact/triggers/trigger/
80+
#declare score_holder $GameTime
81+
7882
#> スロットの数値化
7983
# @within function
8084
# asset_manager:artifact/data/new/fetch_data/*

‎TheSkyBlessing/data/asset_manager/functions/artifact/check/check_mp.mcfunction

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,10 @@
44
#
55
# @within function asset_manager:artifact/check/
66

7-
#> Private
8-
# @private
9-
#declare score_holder $Length
10-
117
# MP必要量を取得
128
execute if data storage asset:artifact TargetItem.MPRequire run data modify storage api: Argument.Threshold set from storage asset:artifact TargetItems[-1].tag.TSB.MPRequire
139
execute unless data storage asset:artifact TargetItem.MPRequire run data modify storage api: Argument.Threshold set from storage asset:artifact TargetItems[-1].tag.TSB.MPCost
14-
# アイテム数だけ増やす
15-
# execute store result score $Length Temporary if data storage asset:artifact TargetItems[]
16-
# scoreboard players operation $CheckMP Lib *= $Length Temporary
1710
# チェック
1811
function api:mp/check
1912
# タグ付与
2013
execute unless data storage api: Return{IsThresholdOrMore:true} run tag @s add CheckFailed
21-
# リセット
22-
scoreboard players reset $Length Temporary

‎TheSkyBlessing/data/asset_manager/functions/artifact/cooldown/main_bar/construct_message.m.mcfunction

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@
44
#
55
# @within function asset_manager:artifact/cooldown/main_bar/
66

7-
$data modify storage asset:artifact MainBarMessage set value ['{"text":"\\uC051","font":"space"}','{"text":"\\u$(Value)","font":"cooldown/main_bar","color":"$(Color)"}','{"text":"\\uC051","font":"space"}']
7+
$data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].Message.MainBar set value ['{"text":"\\uC051","font":"space"}','{"text":"\\u$(Value)","font":"cooldown/main_bar","color":"$(Color)"}','{"text":"\\uC051","font":"space"}']

‎TheSkyBlessing/data/asset_manager/functions/artifact/cooldown/mini_bar/construct_message.m.mcfunction

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@
44
#
55
# @within function asset_manager:artifact/cooldown/mini_bar/
66

7-
$data modify storage asset:artifact MiniBarsMessage set value ['{"text":"\\uC151","font":"space"}','{"text":"\\u$(Head)","font":"cooldown/mini_bar/head"}','{"text":"\\uC024","font":"space"}','{"text":"\\u$(Chest)","font":"cooldown/mini_bar/chest"}','{"text":"\\uC024","font":"space"}','{"text":"\\u$(Legs)","font":"cooldown/mini_bar/legs"}','{"text":"\\uC024","font":"space"}','{"text":"\\u$(Feet)","font":"cooldown/mini_bar/feet"}','{"text":"\\u0003","font":"space"}','{"text":"\\u$(Offhand)","font":"cooldown/mini_bar/offhand"}','{"text":"\\u0011","font":"space"}','{"text":"\\u$(Hotbar0)","font":"cooldown/mini_bar/common"}','{"text":"\\u0002","font":"space"}','{"text":"\\u$(Hotbar1)","font":"cooldown/mini_bar/common"}','{"text":"\\u0002","font":"space"}','{"text":"\\u$(Hotbar2)","font":"cooldown/mini_bar/common"}','{"text":"\\u0002","font":"space"}','{"text":"\\u$(Hotbar3)","font":"cooldown/mini_bar/common"}','{"text":"\\u0002","font":"space"}','{"text":"\\u$(Hotbar4)","font":"cooldown/mini_bar/common"}','{"text":"\\u0002","font":"space"}','{"text":"\\u$(Hotbar5)","font":"cooldown/mini_bar/common"}','{"text":"\\u0002","font":"space"}','{"text":"\\u$(Hotbar6)","font":"cooldown/mini_bar/common"}','{"text":"\\u0002","font":"space"}','{"text":"\\u$(Hotbar7)","font":"cooldown/mini_bar/common"}','{"text":"\\u0002","font":"space"}','{"text":"\\u$(Hotbar8)","font":"cooldown/mini_bar/common"}','{"text":"\\uC089","font":"space"}']
7+
$data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].Message.MiniBars set value ['{"text":"\\uC151","font":"space"}','{"text":"\\u$(Head)","font":"cooldown/mini_bar/head"}','{"text":"\\uC024","font":"space"}','{"text":"\\u$(Chest)","font":"cooldown/mini_bar/chest"}','{"text":"\\uC024","font":"space"}','{"text":"\\u$(Legs)","font":"cooldown/mini_bar/legs"}','{"text":"\\uC024","font":"space"}','{"text":"\\u$(Feet)","font":"cooldown/mini_bar/feet"}','{"text":"\\u0003","font":"space"}','{"text":"\\u$(Offhand)","font":"cooldown/mini_bar/offhand"}','{"text":"\\u0011","font":"space"}','{"text":"\\u$(Hotbar0)","font":"cooldown/mini_bar/common"}','{"text":"\\u0002","font":"space"}','{"text":"\\u$(Hotbar1)","font":"cooldown/mini_bar/common"}','{"text":"\\u0002","font":"space"}','{"text":"\\u$(Hotbar2)","font":"cooldown/mini_bar/common"}','{"text":"\\u0002","font":"space"}','{"text":"\\u$(Hotbar3)","font":"cooldown/mini_bar/common"}','{"text":"\\u0002","font":"space"}','{"text":"\\u$(Hotbar4)","font":"cooldown/mini_bar/common"}','{"text":"\\u0002","font":"space"}','{"text":"\\u$(Hotbar5)","font":"cooldown/mini_bar/common"}','{"text":"\\u0002","font":"space"}','{"text":"\\u$(Hotbar6)","font":"cooldown/mini_bar/common"}','{"text":"\\u0002","font":"space"}','{"text":"\\u$(Hotbar7)","font":"cooldown/mini_bar/common"}','{"text":"\\u0002","font":"space"}','{"text":"\\u$(Hotbar8)","font":"cooldown/mini_bar/common"}','{"text":"\\uC089","font":"space"}']

‎TheSkyBlessing/data/asset_manager/functions/artifact/handler/on_damage_without_source.mcfunction

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ function oh_my_dat:please
2828
execute if entity @s[advancements={core:handler/damage={blocked=false}}] run data modify storage asset:artifact Blocked set value false
2929

3030
# ダメージ取得
31-
scoreboard players operation $Damage Temporary = @s TakenDamage
31+
scoreboard players operation $Damage Temporary += @s TakenDamage
32+
scoreboard players operation $Damage Temporary += @s AbsorbedDamage
3233
scoreboard players operation $Damage Temporary *= $10 Const
3334
# ArtifactEvents にデータ追加
3435
data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].ArtifactEvents.Damage append value {IsVanilla:true}
@@ -40,4 +41,5 @@ function oh_my_dat:please
4041
data remove storage asset:artifact Blocked
4142
data remove storage asset:artifact DamageType
4243
scoreboard players reset @s TakenDamage
44+
scoreboard players reset @s AbsorbedDamage
4345
scoreboard players reset $Damage Temporary

‎TheSkyBlessing/data/asset_manager/functions/artifact/triggers/event/use_item/reset.mcfunction

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
# asset_manager:artifact/triggers/
77
# asset_manager:artifact/triggers/trigger/
88
# asset_manager:artifact/triggers/use_item/
9+
# asset_manager:artifact/triggers/shot/
910

1011
# タグをはがす
1112
tag @s remove ConsumingItem

0 commit comments

Comments
 (0)