Skip to content

Commit 79b2398

Browse files
Lapis-LJALapis-LJA
committed
アポカリプスの仕様を暫定的に調整
1 parent 1ed1e0a commit 79b2398

7 files changed

Lines changed: 30 additions & 62 deletions

File tree

‎Asset/data/asset/functions/artifact/1269.apocalypse/trigger/0.load.mcfunction‎

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

‎Asset/data/asset/functions/artifact/1269.apocalypse/using_item/3.main.mcfunction‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,9 @@
44
#
55
# @within function asset:artifact/1269.apocalypse/using_item/2.check_condition
66

7-
# チャージのチェック
8-
function asset:artifact/1269.apocalypse/using_item/check_charge
9-
107
# 演出
118
particle minecraft:trial_spawner_detection ~ ~ ~ 1 0.4 1 0 1
129
execute positioned ~ ~1 ~ run function asset:artifact/1269.apocalypse/using_item/vfx
1310

14-
1511
# エフェクトのスタック更新など
1612
function asset:artifact/1269.apocalypse/using_item/update_stack

‎Asset/data/asset/functions/artifact/1269.apocalypse/using_item/check_charge.mcfunction‎

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

‎Asset/data/asset/functions/artifact/1269.apocalypse/using_item/give_charge.m.mcfunction‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
#> asset:artifact/1269.apocalypse/using_item/give_charge.m
2+
#
3+
#
4+
#
5+
# @within function asset:artifact/1269.apocalypse/using_item/update_stack
6+
7+
# チャージ用エフェクトを付与
8+
data modify storage api: Argument.ID set value 334
9+
data modify storage api: Argument.Duration set value 40
10+
$data modify storage api: Argument.Stack set value $(Stack)
11+
function api:entity/mob/effect/give
12+
function api:entity/mob/effect/reset

‎Asset/data/asset/functions/artifact/1269.apocalypse/using_item/update_stack.mcfunction‎

Lines changed: 17 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -4,32 +4,28 @@
44
#
55
# @within function asset:artifact/1269.apocalypse/using_item/3.main
66

7-
# スタック更新とそれの演出
8-
execute if score @s Z9.Charge matches 1 run data modify storage api: Argument.Stack set value 1
9-
execute if score @s Z9.Charge matches 1 run playsound block.beacon.activate player @a ~ ~ ~ 1 1.2
107

11-
execute if score @s Z9.Charge matches 21..40 run data modify storage api: Argument.Stack set value 2
12-
execute if score @s Z9.Charge matches 21 run playsound block.beacon.activate player @a ~ ~ ~ 1 1.3
8+
# スタック更新とそれの演出
9+
execute if data storage asset:context UsingItemTime{mainhand:1} run function asset:artifact/1269.apocalypse/using_item/give_charge.m {Stack:1}
10+
execute if data storage asset:context UsingItemTime{mainhand:1} run playsound block.beacon.activate player @a ~ ~ ~ 1 1.2
1311

14-
execute if score @s Z9.Charge matches 41..60 run data modify storage api: Argument.Stack set value 3
15-
execute if score @s Z9.Charge matches 41 run playsound block.beacon.activate player @a ~ ~ ~ 1 1.4
12+
execute if data storage asset:context UsingItemTime{mainhand:21} run function asset:artifact/1269.apocalypse/using_item/give_charge.m {Stack:2}
13+
execute if data storage asset:context UsingItemTime{mainhand:21} run playsound block.beacon.activate player @a ~ ~ ~ 1 1.3
1614

17-
execute if score @s Z9.Charge matches 61..80 run data modify storage api: Argument.Stack set value 4
18-
execute if score @s Z9.Charge matches 61 run playsound block.beacon.activate player @a ~ ~ ~ 1 1.5
15+
execute if data storage asset:context UsingItemTime{mainhand:41} run function asset:artifact/1269.apocalypse/using_item/give_charge.m {Stack:3}
16+
execute if data storage asset:context UsingItemTime{mainhand:41} run playsound block.beacon.activate player @a ~ ~ ~ 1 1.4
1917

20-
execute if score @s Z9.Charge matches 81..100 run data modify storage api: Argument.Stack set value 5
21-
execute if score @s Z9.Charge matches 81 run playsound block.beacon.activate player @a ~ ~ ~ 1 1.6
18+
execute if data storage asset:context UsingItemTime{mainhand:61} run function asset:artifact/1269.apocalypse/using_item/give_charge.m {Stack:4}
19+
execute if data storage asset:context UsingItemTime{mainhand:61} run playsound block.beacon.activate player @a ~ ~ ~ 1 1.5
2220

23-
execute if score @s Z9.Charge matches 101..120 run data modify storage api: Argument.Stack set value 6
24-
execute if score @s Z9.Charge matches 101 run playsound block.beacon.activate player @a ~ ~ ~ 1 1.8
21+
execute if data storage asset:context UsingItemTime{mainhand:81} run function asset:artifact/1269.apocalypse/using_item/give_charge.m {Stack:5}
22+
execute if data storage asset:context UsingItemTime{mainhand:81} run playsound block.beacon.activate player @a ~ ~ ~ 1 1.6
2523

26-
execute if score @s Z9.Charge matches 121..140 run data modify storage api: Argument.Stack set value 7
27-
execute if score @s Z9.Charge matches 121 run playsound block.beacon.activate player @a ~ ~ ~ 1 1.9
24+
execute if data storage asset:context UsingItemTime{mainhand:101} run function asset:artifact/1269.apocalypse/using_item/give_charge.m {Stack:6}
25+
execute if data storage asset:context UsingItemTime{mainhand:101} run playsound block.beacon.activate player @a ~ ~ ~ 1 1.8
2826

29-
execute if score @s Z9.Charge matches 141.. run data modify storage api: Argument.Stack set value 8
30-
execute if score @s Z9.Charge matches 141 run playsound block.beacon.activate player @a ~ ~ ~ 1 2.0
27+
execute if data storage asset:context UsingItemTime{mainhand:121} run function asset:artifact/1269.apocalypse/using_item/give_charge.m {Stack:7}
28+
execute if data storage asset:context UsingItemTime{mainhand:121} run playsound block.beacon.activate player @a ~ ~ ~ 1 1.9
3129

32-
# チャージ用エフェクトを付与
33-
data modify storage api: Argument.ID set value 334
34-
function api:entity/mob/effect/give
35-
function api:entity/mob/effect/reset
30+
execute if data storage asset:context UsingItemTime{mainhand:141} run function asset:artifact/1269.apocalypse/using_item/give_charge.m {Stack:8}
31+
execute if data storage asset:context UsingItemTime{mainhand:141} run playsound block.beacon.activate player @a ~ ~ ~ 1 2.0

‎Asset/data/asset/functions/effect/0334.charge_of_apocalypse/register.mcfunction‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# 説明文 (TextComponentString[])
1414
data modify storage asset:effect Description set value ['{"text":"チャージ段階に応じてアポカリプスのダメージが増加する"}']
1515
# 効果時間 (int) (default = API || error)
16-
data modify storage asset:effect Duration set value 40
16+
# data modify storage asset:effect Duration set value 40
1717
# スタック (int) (default = API || 1)
1818
# data modify storage asset:effect Stack set value
1919
# 効果時間の操作方法 (default = API || "replace")

‎Asset/data/asset/tags/functions/artifact/load.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
"asset:artifact/1252.fox_candle/trigger/0.load",
88
"asset:artifact/1311.yearning_rose/damage_from_entity/0.load",
99
"asset:artifact/1220.sacred_hardener/trigger/0.load",
10-
"asset:artifact/1269.apocalypse/trigger/0.load",
1110
"asset:artifact/1061.hekireki/trigger/0.load",
1211
"asset:artifact/0364.red_knights_sword/trigger/0.load",
1312
"asset:artifact/1206.triple_sparkle_bomb/trigger/0.load",

0 commit comments

Comments
 (0)