キャンドル演出修正、軽量化

TUSB · Sep 18, 2022 · 1e1818d · 1e1818d
1 parent 07c3170
commit 1e1818d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 11 deletions.
diff --git a/data/makeup/functions/skill/act/black_mage/candle/tick.mcfunction b/data/makeup/functions/skill/act/black_mage/candle/tick.mcfunction
@@ -1,5 +1,5 @@
 
-execute if score $Second Count matches 1 run playsound minecraft:block.fire.ambient master @a[distance=..16] ~ ~ ~ 1 1
+execute if score $Tick Count matches 1 run playsound minecraft:block.fire.ambient master @a[distance=..16] ~ ~ ~ 1 1
 execute if entity @s[nbt={PortalCooldown:20}] run playsound minecraft:entity.generic.extinguish_fire master @a[distance=..16] ~ ~ ~ 1 1
 particle minecraft:smoke ~ ~0.75 ~ 0.1 0.25 0.1 0.001 1 force @a[tag=ShowParticles]
 execute positioned ~-5 ~-3 ~-5 as @e[type=minecraft:spawner_minecart,tag=Spawner,dx=10,dy=8,dz=10] positioned as @s run particle minecraft:falling_dust minecraft:orange_wool ~ ~ ~ 0.5 0.5 0.5 1 2 force @a[tag=ShowParticles]
diff --git a/data/skill/functions/act/black_mage/candle/act0.mcfunction b/data/skill/functions/act/black_mage/candle/act0.mcfunction
@@ -1,18 +1,13 @@
 
 ### キャンドル発動
 
-execute if block ~ ~2.1 ~ minecraft:air run summon minecraft:endermite ~ ~2.1 ~ {Tags:[Skill,Candle,NativeTask,TickingRequired,Initializing,Initialized],Lifetime:2000,Fire:1200s,PortalCooldown:1,ActiveEffects:[{Id:14b,Amplifier:0b,Duration:1200,ShowParticles:true}],Invulnerable:true,Silent:true,NoAI:true}
+execute if block ~ ~2.1 ~ minecraft:air run summon minecraft:endermite ~ ~2.1 ~ {Tags:[Skill,Candle,NativeTask,TickingRequired],Fire:1200s,ActiveEffects:[{Id:14b,Amplifier:0b,Duration:1200,ShowParticles:true}],Invulnerable:true,Silent:true,NoAI:true}
 
-execute store result score _ _ run data get entity @s Pos[1] 1
-scoreboard players remove _ _ 300
-scoreboard players set _ Calc -1
-scoreboard players operation _ _ *= _ Calc
-scoreboard players set _ Calc 2
-execute if score _ Level matches 2 run scoreboard players operation _ _ *= _ Calc
+execute store result score _ _ run data get entity @s Pos[1] -1
+scoreboard players add _ _ 300
+execute if score _ Level matches 2 run scoreboard players operation _ _ += _ _
 
-execute as @e[tag=Initializing,limit=1] store result entity @s PortalCooldown int 1 run scoreboard players get _ _
-execute as @e[tag=Candle,distance=..0.01,limit=1] store result entity @s PortalCooldown int 1 run scoreboard players get _ _
-tag @e[tag=Initializing,limit=1] remove Initializing
+execute positioned ~ ~2.1 ~ store result entity @e[tag=Candle,tag=!Initialized,distance=..0.01,limit=1] PortalCooldown int 1 run scoreboard players get _ _
 
 execute positioned ~-5 ~-3 ~-5 as @e[type=minecraft:spawner_minecart,tag=Spawner,dx=10,dy=8,dz=10] store result entity @s Delay short 1 run scoreboard players get _ _