Skip to content

Commit 71af9d2

Browse files
Lapis-LJALapis-LJA
committed
Merge branch 'master' into dev/lapis_daily_trader
2 parents 9425091 + fdee1ee commit 71af9d2

30 files changed

Lines changed: 200 additions & 114 deletions

File tree

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

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

77
# | ダメージ表示 | 被ダメ演出 | 体力減少 | イベント | 備考 |
88
# 通常 Mob | 本体 | 本体 | 本体 | 本体 | |
9-
# ForwardTarget | 本体 | 本体 | FT | 両方 | |
10-
# ExtendedCollision | 本体 | FT | FT | FT | api:damage/ の時点で Forward してるから気にしなくていいよ |
9+
# ForwardTarget | 本体 | 本体 | FT | 両方※ | ※ attack / kill イベントの対象に FT を含めないようにする |
10+
# ExtendedCollision | 本体 | FT | FT | FT | api:damage/ の時点で Forward してるから気にしなくていいよ |
1111

1212
#> Val
1313
# @private
@@ -27,7 +27,7 @@
2727
function api:damage/core/health_subtract/non-player/damage_vfx
2828

2929
# イベントの追加
30-
function api:mob/apply_to_forward_target/with_idempotent.m {CB:"api:damage/core/trigger_events/non-player/attack_and_hurt/",IsForwardedOnly:false}
31-
execute if score $Health Temporary matches ..0 run function api:mob/apply_to_forward_target/with_idempotent.m {CB:"api:damage/core/trigger_events/non-player/kill_and_death/",IsForwardedOnly:true}
30+
function api:damage/core/trigger_events/non-player/attack_and_hurt/
31+
execute if score $Health Temporary matches ..0 run function api:damage/core/trigger_events/non-player/kill_and_death/
3232
# コアから実行する処理
3333
function api:mob/apply_to_forward_target/with_idempotent.m {CB:"api:damage/core/health_subtract/non-player/for_health_entity",IsForwardedOnly:true}

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

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,15 @@
22
#
33
# attackトリガー用の進捗を手動でトリガーします
44
#
5-
# @within function api:damage/core/health_subtract/non-player/add_event
5+
# @within function api:damage/core/health_subtract/non-player/
66

77
#> Declare
88
# @within function api:damage/core/trigger_events/non-player/attack_and_hurt/*
99
#declare score_holder $DamagerUUID
1010

11-
# Mob の UUID を記録しておく
12-
scoreboard players operation $DamagerUUID Temporary = @s MobUUID
1311
# Hurt イベントの push
14-
function api:damage/core/trigger_events/non-player/attack_and_hurt/hurt
12+
function api:mob/apply_to_forward_target/with_idempotent.m {CB:"api:damage/core/trigger_events/non-player/attack_and_hurt/hurt",IsForwardedOnly:false}
1513
# Attack イベントの push
16-
execute unless predicate api:mob/has_forward_target as @a if score @s UserID = $LatestModifiedUser UserID run function api:damage/core/trigger_events/non-player/attack_and_hurt/attack
17-
# リセット
14+
scoreboard players operation $DamagerUUID Temporary = @s MobUUID
15+
execute as @a if score @s UserID = $LatestModifiedUser UserID run function api:damage/core/trigger_events/non-player/attack_and_hurt/attack
1816
scoreboard players reset $DamagerUUID Temporary

‎TheSkyBlessing/data/api/functions/damage/core/trigger_events/non-player/attack_and_hurt/attack.mcfunction‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
#> Private
88
# @private
9-
#declare score_holder $LastIndex
9+
#declare score_holder $LastIndex
1010

1111
function oh_my_dat:please
1212

‎TheSkyBlessing/data/api/functions/damage/core/trigger_events/non-player/attack_and_hurt/hurt.mcfunction‎

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,18 @@
66

77
function oh_my_dat:please
88

9-
data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].MobEvents.Hurt append value {Type: "api",IsVanilla:false}
10-
execute store result storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].MobEvents.Hurt[-1].Amount double 0.01 run scoreboard players get $Damage Temporary
11-
data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].MobEvents.Hurt[-1].AttackType set from storage api: Argument.AttackType
12-
data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].MobEvents.Hurt[-1].ElementType set from storage api: Argument.ElementType
13-
data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].MobEvents.Hurt[-1].Metadata set from storage api: Argument.Metadata
14-
execute if data storage api: Argument{ApplyTrigger:true} run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].MobEvents.Hurt[-1].IsDoT set value false
15-
execute if data storage api: Argument{ApplyTrigger:false} run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].MobEvents.Hurt[-1].IsDoT set value true
16-
execute as @a if score @s UserID = $LatestModifiedUser UserID store result storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].MobEvents.Hurt[-1].From int 1 run scoreboard players get @s UserID
9+
# Mob の UUID を記録しておく
10+
scoreboard players operation $DamagerUUID Temporary = @s MobUUID
11+
12+
# 攻撃情報を追加する
13+
data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].MobEvents.Hurt append value {Type: "api",IsVanilla:false}
14+
execute store result storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].MobEvents.Hurt[-1].Amount double 0.01 run scoreboard players get $Damage Temporary
15+
data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].MobEvents.Hurt[-1].AttackType set from storage api: Argument.AttackType
16+
data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].MobEvents.Hurt[-1].ElementType set from storage api: Argument.ElementType
17+
data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].MobEvents.Hurt[-1].Metadata set from storage api: Argument.Metadata
18+
execute if data storage api: Argument{ApplyTrigger:true} run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].MobEvents.Hurt[-1].IsDoT set value false
19+
execute if data storage api: Argument{ApplyTrigger:false} run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].MobEvents.Hurt[-1].IsDoT set value true
20+
execute as @a if score @s UserID = $LatestModifiedUser UserID store result storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].MobEvents.Hurt[-1].From int 1 run scoreboard players get @s UserID
21+
22+
# リセット
23+
scoreboard players reset $DamagerUUID Temporary

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

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,15 @@
22
#
33
#
44
#
5-
# @within function api:damage/core/health_subtract/non-player/add_event
5+
# @within function api:damage/core/health_subtract/non-player/
66

77
#> Declare
88
# @within function api:damage/core/trigger_events/non-player/kill_and_death/*
99
#declare score_holder $DamagerUUID
1010

11-
# Mob の UUID を記録しておく
12-
scoreboard players operation $DamagerUUID Temporary = @s MobUUID
1311
# Death イベントの push
14-
function api:damage/core/trigger_events/non-player/kill_and_death/death
12+
function api:mob/apply_to_forward_target/with_idempotent.m {CB:"api:damage/core/trigger_events/non-player/kill_and_death/death",IsForwardedOnly:true}
1513
# Kill イベントの push
16-
execute unless predicate api:mob/has_forward_target as @a if score @s UserID = $LatestModifiedUser UserID run function api:damage/core/trigger_events/non-player/kill_and_death/kill
17-
# リセット
14+
scoreboard players operation $DamagerUUID Temporary = @s MobUUID
15+
execute as @a if score @s UserID = $LatestModifiedUser UserID run function api:damage/core/trigger_events/non-player/kill_and_death/kill
1816
scoreboard players reset $DamagerUUID Temporary

‎TheSkyBlessing/data/api/functions/damage/core/trigger_events/non-player/kill_and_death/death.mcfunction‎

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,16 @@
66

77
function oh_my_dat:please
88

9-
data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].MobEvents.Death append value {Type: "api",IsVanilla:false}
10-
execute store result storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].MobEvents.Death[-1].Amount double 0.01 run scoreboard players get $Damage Temporary
11-
data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].MobEvents.Death[-1].AttackType set from storage api: Argument.AttackType
12-
data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].MobEvents.Death[-1].ElementType set from storage api: Argument.ElementType
13-
data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].MobEvents.Death[-1].Metadata set from storage api: Argument.Metadata
14-
execute as @a if score @s UserID = $LatestModifiedUser UserID store result storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].MobEvents.Death[-1].From int 1 run scoreboard players get @s UserID
9+
# Mob の UUID を記録しておく
10+
scoreboard players operation $DamagerUUID Temporary = @s MobUUID
11+
12+
# 攻撃情報を追加する
13+
data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].MobEvents.Death append value {Type: "api",IsVanilla:false}
14+
execute store result storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].MobEvents.Death[-1].Amount double 0.01 run scoreboard players get $Damage Temporary
15+
data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].MobEvents.Death[-1].AttackType set from storage api: Argument.AttackType
16+
data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].MobEvents.Death[-1].ElementType set from storage api: Argument.ElementType
17+
data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].MobEvents.Death[-1].Metadata set from storage api: Argument.Metadata
18+
execute as @a if score @s UserID = $LatestModifiedUser UserID store result storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].MobEvents.Death[-1].From int 1 run scoreboard players get @s UserID
19+
20+
# リセット
21+
scoreboard players reset $DamagerUUID Temporary

‎TheSkyBlessing/data/api/functions/damage/core/trigger_events/non-player/kill_and_death/kill.mcfunction‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,10 @@
66

77
function oh_my_dat:please
88

9-
data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].ArtifactEvents.Killed append value {Type: "api",IsVanilla:false}
10-
execute store result storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].ArtifactEvents.Killed[-1].To int 1 run scoreboard players get $DamagerUUID Temporary
11-
execute store result storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].ArtifactEvents.Killed[-1].Amount double 0.01 run scoreboard players get $Damage Temporary
12-
data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].ArtifactEvents.Killed[-1].AttackType set from storage api: Argument.AttackType
13-
data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].ArtifactEvents.Killed[-1].ElementType set from storage api: Argument.ElementType
14-
data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].ArtifactEvents.Killed[-1].Metadata set from storage api: Argument.Metadata
9+
# 攻撃情報を追加する
10+
data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].ArtifactEvents.Killed append value {Type: "api",IsVanilla:false}
11+
execute store result storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].ArtifactEvents.Killed[-1].To int 1 run scoreboard players get $DamagerUUID Temporary
12+
execute store result storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].ArtifactEvents.Killed[-1].Amount double 0.01 run scoreboard players get $Damage Temporary
13+
data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].ArtifactEvents.Killed[-1].AttackType set from storage api: Argument.AttackType
14+
data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].ArtifactEvents.Killed[-1].ElementType set from storage api: Argument.ElementType
15+
data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].ArtifactEvents.Killed[-1].Metadata set from storage api: Argument.Metadata

‎TheSkyBlessing/data/api/functions/mob/apply_to_forward_target/with_idempotent.m.mcfunction‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
# そのまま実行する
1515
$execute unless data storage global Boolean.$(IsForwardedOnly) run function $(CB)
16-
# 対象が ForwardTarget でなければ return
16+
# 対象に ForwardTarget がなければ return
1717
$execute unless predicate api:mob/has_forward_target run return run execute if data storage global Boolean.$(IsForwardedOnly) run function $(CB)
1818
# ForwardTarget を実行者として CB を呼び出す
1919
scoreboard players operation $ForwardTarget Temporary = @s ForwardTargetMobUUID

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
# 条件を満たしてなかったらtag削除
1717
# 信仰による制限
1818
execute unless data storage asset:artifact DisabledCheckFlag{Believe:true} if entity @s[tag=CanUsed] run function asset_manager:artifact/check/check_believe
19-
execute if entity @s[tag=CheckFailed] unless score @s BelieveLogCD matches 0.. run tellraw @s {"text":"現在の信仰では使えないようだ...","color":"red"}
19+
execute if entity @s[tag=CheckFailed] unless data storage asset:artifact DisabledCheckFlag{BelieveMessage:true} unless score @s BelieveLogCD matches 0.. run tellraw @s {"text":"現在の信仰では使えないようだ...","color":"red"}
2020
execute if entity @s[tag=CheckFailed] unless score @s BelieveLogCD matches 0.. run scoreboard players set @s BelieveLogCD 100
2121
execute if entity @s[tag=CheckFailed] run tag @s remove CanUsed
2222
tag @s[tag=CheckFailed] remove CheckFailed

‎TheSkyBlessing/data/asset_manager/functions/artifact/create/set_lore/trigger.mcfunction‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
# 接続詞
1818
data modify storage asset:artifact Temp.Trigger.AB set value "し"
1919
# トリガー
20-
execute if data storage asset:artifact {Trigger:"onClick"} run data modify storage asset:artifact Temp.Trigger.B set value "右クリック"
20+
execute if data storage asset:artifact {Trigger:"onClick"} run data modify storage asset:artifact Temp.Trigger.B set value '{"keybind":"key.use"}'
2121
execute if data storage asset:artifact {Trigger:"shot"} run data modify storage asset:artifact Temp.Trigger.B set value "発射"
2222
execute if data storage asset:artifact {Trigger:"itemUse"} run data modify storage asset:artifact Temp.Trigger.B set value "使用"
2323
execute if data storage asset:artifact {Trigger:"passive"} run data modify storage asset:artifact Temp.Trigger.B set value "ている限り"

0 commit comments

Comments
 (0)