Skip to content

Commit

Permalink
👽 [Artifact 566-569] 装備時効果の処理を移行
Browse files Browse the repository at this point in the history
  • Loading branch information
@haiiro2gou
haiiro2gou committed Jan 26, 2025
1 parent 0d417e7 commit 2665928
Show file tree
Hide file tree
Showing 72 changed files with 534 additions and 624 deletions.
4 changes: 0 additions & 4 deletions Asset/data/asset/functions/artifact/0566.great_sage_helmet/_index.d.mcfunction
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
#> asset:artifact/0566.great_sage_helmet/_index.d
# @private

#> tag
# @within function asset:artifact/056?.great_sage_*/**
#declare tag FQ.Fullset

#> score_holder
# @within function asset:artifact/0566.great_sage_helmet/fullset/**
#declare score_holder $Random
8 changes: 4 additions & 4 deletions ...e_helmet/equip/fullset/damage/.mcfunction → ...0566.great_sage_helmet/damage/.mcfunction
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#> asset:artifact/0566.great_sage_helmet/equip/fullset/damage/
#> asset:artifact/0566.great_sage_helmet/damage/
#
# 神器のトリガー処理
#
#
# @within function asset:artifact/0566.great_sage_helmet/equip/fullset/damage/check
# @within function asset:artifact/alias/566/damage/

#> Val
# @private
Expand All @@ -13,7 +13,7 @@
execute store result score $FQ.HealthPer Temporary run data get storage api: Return.HealthPer 1000

# 体力が20%以下かつ10%の確率で喋る
execute if score $FQ.HealthPer Temporary matches ..200 if predicate lib:random_pass_per/10 run function asset:artifact/0566.great_sage_helmet/equip/fullset/damage/talk
execute if score $FQ.HealthPer Temporary matches ..200 if predicate lib:random_pass_per/10 run function asset:artifact/0566.great_sage_helmet/damage/talk

# リセット
scoreboard players reset $FQ.HealthPer Temporary
10 changes: 10 additions & 0 deletions Asset/data/asset/functions/artifact/0566.great_sage_helmet/damage/check.mcfunction
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
#> asset:artifact/0566.great_sage_helmet/damage/check
#
# 神器の使用条件の確認処理
#
# @within function asset:artifact/alias/566/damage/check

# フルセットかどうか確認する
data modify storage api: Argument.ID set value 256
function api:entity/mob/effect/get/from_id
execute unless data storage api: Return.Effect{Stack:4} run tag @s remove CanUsed
4 changes: 2 additions & 2 deletions ...lmet/equip/fullset/damage/talk.mcfunction → ....great_sage_helmet/damage/talk.mcfunction
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#> asset:artifact/0566.great_sage_helmet/equip/fullset/damage/talk
#> asset:artifact/0566.great_sage_helmet/damage/talk
#
#
#
# @within function asset:artifact/0566.great_sage_helmet/equip/fullset/damage/
# @within function asset:artifact/0566.great_sage_helmet/damage/

# 喋る
playsound minecraft:entity.allay.hurt player @a ~ ~ ~ 0.4 1.6
Expand Down
9 changes: 9 additions & 0 deletions Asset/data/asset/functions/artifact/0566.great_sage_helmet/equip.mcfunction
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#> asset:artifact/0566.great_sage_helmet/equip
#
# 神器の装備時の処理
#
# @within function asset:artifact/alias/566/equip

# 演出
particle end_rod ~ ~1.7 ~ 0.3 0.1 0.3 0.1 10 normal @a
playsound minecraft:block.enchantment_table.use player @a ~ ~ ~ 0.8 1
43 changes: 0 additions & 43 deletions Asset/data/asset/functions/artifact/0566.great_sage_helmet/equip/.mcfunction
View file

This file was deleted.

7 changes: 0 additions & 7 deletions Asset/data/asset/functions/artifact/0566.great_sage_helmet/equip/check.mcfunction
View file

This file was deleted.

7 changes: 0 additions & 7 deletions Asset/data/asset/functions/artifact/0566.great_sage_helmet/equip/dis_equip/.mcfunction
View file

This file was deleted.

28 changes: 0 additions & 28 deletions Asset/data/asset/functions/artifact/0566.great_sage_helmet/equip/dis_equip/main.mcfunction
View file

This file was deleted.

8 changes: 0 additions & 8 deletions ...ata/asset/functions/artifact/0566.great_sage_helmet/equip/fullset/damage/check.mcfunction
View file

This file was deleted.

8 changes: 0 additions & 8 deletions Asset/data/asset/functions/artifact/0566.great_sage_helmet/equip/fullset/heal/.mcfunction
View file

This file was deleted.

8 changes: 0 additions & 8 deletions .../data/asset/functions/artifact/0566.great_sage_helmet/equip/fullset/heal/check.mcfunction
View file

This file was deleted.

8 changes: 0 additions & 8 deletions .../data/asset/functions/artifact/0566.great_sage_helmet/equip/fullset/kill/check.mcfunction
View file

This file was deleted.

8 changes: 0 additions & 8 deletions .../data/asset/functions/artifact/0566.great_sage_helmet/equip/fullset/tick/check.mcfunction
View file

This file was deleted.

8 changes: 8 additions & 0 deletions Asset/data/asset/functions/artifact/0566.great_sage_helmet/heal/.mcfunction
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#> asset:artifact/0566.great_sage_helmet/heal/
#
# 神器のトリガー処理
#
# @within function asset:artifact/alias/566/heal/

# 確率で話しかけてくる
execute if predicate lib:random_pass_per/5 run function asset:artifact/0566.great_sage_helmet/heal/talk
10 changes: 10 additions & 0 deletions Asset/data/asset/functions/artifact/0566.great_sage_helmet/heal/check.mcfunction
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
#> asset:artifact/0566.great_sage_helmet/heal/check
#
# 神器の使用条件の確認処理
#
# @within function asset:artifact/alias/566/heal/check

# フルセットかどうか確認する
data modify storage api: Argument.ID set value 256
function api:entity/mob/effect/get/from_id
execute unless data storage api: Return.Effect{Stack:4} run tag @s remove CanUsed
4 changes: 2 additions & 2 deletions ...helmet/equip/fullset/heal/talk.mcfunction → ...66.great_sage_helmet/heal/talk.mcfunction
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#> asset:artifact/0566.great_sage_helmet/equip/fullset/heal/talk
#> asset:artifact/0566.great_sage_helmet/heal/talk
#
#
#
# @within function asset:artifact/0566.great_sage_helmet/equip/fullset/heal/
# @within function asset:artifact/0566.great_sage_helmet/heal/

# 喋る
playsound minecraft:entity.allay.item_given player @a ~ ~ ~ 2 1.45
Expand Down
10 changes: 5 additions & 5 deletions ...age_helmet/equip/fullset/kill/.mcfunction → ...t/0566.great_sage_helmet/kill/.mcfunction
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
#> asset:artifact/0566.great_sage_helmet/equip/fullset/kill/
#> asset:artifact/0566.great_sage_helmet/kill/
#
# 神器のトリガー処理
#
#
# @within function asset:artifact/0566.great_sage_helmet/equip/fullset/kill/check
# @within function asset:artifact/alias/566/kill/

# 周囲に敵モブがいる場合、4%の確率で話してくる
execute if entity @e[tag=Enemy,tag=!Uninterferable,distance=..35] if predicate lib:random_pass_per/4 run function asset:artifact/0566.great_sage_helmet/equip/fullset/kill/talk
execute if entity @e[tag=Enemy,tag=!Uninterferable,distance=..35] if predicate lib:random_pass_per/4 run function asset:artifact/0566.great_sage_helmet/kill/talk

# 周囲に敵モブがいなくなった場合、10%の確率で話してくる
execute unless entity @e[tag=Enemy,tag=!Uninterferable,distance=..35] if predicate lib:random_pass_per/10 run function asset:artifact/0566.great_sage_helmet/equip/fullset/kill/talk_genocide
execute unless entity @e[tag=Enemy,tag=!Uninterferable,distance=..35] if predicate lib:random_pass_per/10 run function asset:artifact/0566.great_sage_helmet/kill/talk_genocide
10 changes: 10 additions & 0 deletions Asset/data/asset/functions/artifact/0566.great_sage_helmet/kill/check.mcfunction
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
#> asset:artifact/0566.great_sage_helmet/kill/check
#
# 神器の使用条件の確認処理
#
# @within function asset:artifact/alias/566/kill/check

# フルセットかどうか確認する
data modify storage api: Argument.ID set value 256
function api:entity/mob/effect/get/from_id
execute unless data storage api: Return.Effect{Stack:4} run tag @s remove CanUsed
4 changes: 2 additions & 2 deletions ...helmet/equip/fullset/kill/talk.mcfunction → ...66.great_sage_helmet/kill/talk.mcfunction
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#> asset:artifact/0566.great_sage_helmet/equip/fullset/kill/talk
#> asset:artifact/0566.great_sage_helmet/kill/talk
#
#
#
# @within function asset:artifact/0566.great_sage_helmet/equip/fullset/kill/
# @within function asset:artifact/0566.great_sage_helmet/kill/

# 喋る
playsound minecraft:entity.allay.item_given player @a ~ ~ ~ 2 1.45
Expand Down
4 changes: 2 additions & 2 deletions ...uip/fullset/kill/talk_genocide.mcfunction → ...sage_helmet/kill/talk_genocide.mcfunction
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#> asset:artifact/0566.great_sage_helmet/equip/fullset/kill/talk_genocide
#> asset:artifact/0566.great_sage_helmet/kill/talk_genocide
#
#
#
# @within function asset:artifact/0566.great_sage_helmet/equip/fullset/kill/
# @within function asset:artifact/0566.great_sage_helmet/kill/

# 喋る
playsound minecraft:entity.allay.item_given player @a ~ ~ ~ 2 1.45
Expand Down
4 changes: 3 additions & 1 deletion Asset/data/asset/functions/artifact/0566.great_sage_helmet/load.mcfunction
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
# @within tag/function asset:artifact/load

#> 定義類はここに
# @within function asset:artifact/0566.great_sage_helmet/**
# @within function
# asset:artifact/0566.great_sage_helmet/**
# asset:effect/0256.the_great_sage_s_attire/**
scoreboard objectives add FQ.TalkTime dummy
scoreboard objectives add FQ.Favorability dummy
Loading

0 comments on commit 2665928

Please sign in to comment.