Skip to content

Commit

Permalink
#294 キアリク等でマイナスエフェクトを解除するように変更
Browse files Browse the repository at this point in the history
  • Loading branch information
@NePonpon
NePonpon committed Apr 11, 2024
1 parent be23b9b commit e431cb2
Show file tree
Hide file tree
Showing 4 changed files with 49 additions and 35 deletions.
12 changes: 2 additions & 10 deletions data/skill/functions/act/common/detoxification/act0.mcfunction
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,7 @@
### 解毒
# デバフを削除する

effect clear @a[distance=..4] blindness
effect clear @a[distance=..4] hunger
effect clear @a[distance=..4] levitation
effect clear @a[distance=..4] mining_fatigue
effect clear @a[distance=..4] nausea
effect clear @a[distance=..4] poison
effect clear @a[distance=..4] slowness
effect clear @a[distance=..4] unluck
effect clear @a[distance=..4] weakness
effect clear @a[distance=..4] wither
## キアリクに任せる
execute as @a[distance=..4] run function skill:act/white_mage/clear/cure/level2

function makeup:skill/act/common/detoxification/act0
58 changes: 33 additions & 25 deletions data/skill/functions/act/common/incomplete_detoxification/act0.mcfunction
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,30 +2,38 @@
### 不完全な解毒
# バフ・デバフを削除する

effect clear @a[distance=..4] absorption
effect clear @a[distance=..4] blindness
effect clear @a[distance=..4] conduit_power
effect clear @a[distance=..4] dolphins_grace
effect clear @a[distance=..4] fire_resistance
effect clear @a[distance=..4] haste
effect clear @a[distance=..4] hunger
effect clear @a[distance=..4] jump_boost
effect clear @a[distance=..4] levitation
effect clear @a[distance=..4] luck
effect clear @a[distance=..4] mining_fatigue
effect clear @a[distance=..4] nausea
effect clear @a[distance=..4] night_vision
effect clear @a[distance=..4] poison
effect clear @a[distance=..4] regeneration
effect clear @a[distance=..4] resistance
effect clear @a[distance=..4] saturation
effect clear @a[distance=..4] slow_falling
effect clear @a[distance=..4] slowness
effect clear @a[distance=..4] speed
effect clear @a[distance=..4] strength
effect clear @a[distance=..4] unluck
effect clear @a[distance=..4] water_breathing
effect clear @a[distance=..4] weakness
effect clear @a[distance=..4] wither
effect clear @a[distance=..4] minecraft:absorption
# effect clear @a[distance=..4] minecraft:bad_omen 呪詛演出用
effect clear @a[distance=..4] minecraft:blindness
effect clear @a[distance=..4] minecraft:conduit_power
effect clear @a[distance=..4] minecraft:darkness
effect clear @a[distance=..4] minecraft:dolphins_grace
effect clear @a[distance=..4] minecraft:fire_resistance
# effect clear @a[distance=..4] minecraft:glowing
effect clear @a[distance=..4] minecraft:haste
# effect clear @a[distance=..4] minecraft:health_boost
effect clear @a[distance=..4] minecraft:hero_of_the_village
effect clear @a[distance=..4] minecraft:hunger
# effect clear @a[distance=..4] minecraft:instant_damage
# effect clear @a[distance=..4] minecraft:instant_health
# effect clear @a[distance=..4] minecraft:invisibility
effect clear @a[distance=..4] minecraft:jump_boost
effect clear @a[distance=..4] minecraft:levitation
effect clear @a[distance=..4] minecraft:luck
effect clear @a[distance=..4] minecraft:mining_fatigue
effect clear @a[distance=..4] minecraft:nausea
effect clear @a[distance=..4] minecraft:night_vision
effect clear @a[distance=..4] minecraft:poison
effect clear @a[distance=..4] minecraft:regeneration
effect clear @a[distance=..4] minecraft:resistance
effect clear @a[distance=..4] minecraft:saturation
effect clear @a[distance=..4] minecraft:slow_falling
effect clear @a[distance=..4] minecraft:slowness
effect clear @a[distance=..4] minecraft:speed
effect clear @a[distance=..4] minecraft:strength
effect clear @a[distance=..4] minecraft:unluck
effect clear @a[distance=..4] minecraft:water_breathing
effect clear @a[distance=..4] minecraft:weakness
effect clear @a[distance=..4] minecraft:wither

function makeup:skill/act/common/detoxification/act0
6 changes: 6 additions & 0 deletions data/skill/functions/act/white_mage/clear/cure/level1.mcfunction
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,9 @@ effect clear @s minecraft:poison
effect clear @s minecraft:weakness
effect clear @s minecraft:wither
effect clear @s minecraft:levitation

# マイナスエフェクト消去
execute if data entity @s ActiveEffects[{Id:5}] store result score _ _ run data get entity @s ActiveEffects[{Id:5}].Amplifier
execute if data entity @s ActiveEffects[{Id:5}] if score _ _ matches ..-1 run effect clear @s strength
execute if data entity @s ActiveEffects[{Id:11}] store result score _ _ run data get entity @s ActiveEffects[{Id:11}].Amplifier
execute if data entity @s ActiveEffects[{Id:11}] if score _ _ matches ..-1 run effect clear @s resistance
8 changes: 8 additions & 0 deletions data/skill/functions/act/white_mage/clear/cure/level2.mcfunction
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,12 @@ effect clear @s minecraft:mining_fatigue
effect clear @s minecraft:slowness
effect clear @s minecraft:darkness

# マイナスエフェクト消去
execute if data entity @s ActiveEffects[{Id:1}] store result score _ _ run data get entity @s ActiveEffects[{Id:1}].Amplifier
execute if data entity @s ActiveEffects[{Id:1}] if score _ _ matches ..-1 run effect clear @s speed
execute if data entity @s ActiveEffects[{Id:3}] store result score _ _ run data get entity @s ActiveEffects[{Id:3}].Amplifier
execute if data entity @s ActiveEffects[{Id:3}] if score _ _ matches ..-1 run effect clear @s haste
execute if data entity @s ActiveEffects[{Id:8}] store result score _ _ run data get entity @s ActiveEffects[{Id:8}].Amplifier
execute if data entity @s ActiveEffects[{Id:8}] if score _ _ matches ..-1 run effect clear @s jump_boost

function skill:act/white_mage/clear/cure/level1

0 comments on commit e431cb2

Please sign in to comment.