From 1a91288889b2bb966d8d9ef6193d9503d611f34a Mon Sep 17 00:00:00 2001 From: InQuognito Date: Mon, 3 Feb 2025 12:59:13 -0600 Subject: [PATCH] k rool nerf for adaptive armor + fix --- .../logic/abilities/adaptive_armor/enable.mcfunction | 7 +++++-- .../function/fighter/king_k_rool/restore_items.mcfunction | 2 ++ data/ssbrc/function/stage/pac_maze/load.mcfunction | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/data/ssbrc/function/fighter/king_k_rool/logic/abilities/adaptive_armor/enable.mcfunction b/data/ssbrc/function/fighter/king_k_rool/logic/abilities/adaptive_armor/enable.mcfunction index 899704093..148b06644 100644 --- a/data/ssbrc/function/fighter/king_k_rool/logic/abilities/adaptive_armor/enable.mcfunction +++ b/data/ssbrc/function/fighter/king_k_rool/logic/abilities/adaptive_armor/enable.mcfunction @@ -1,6 +1,9 @@ tag @s add adaptive_armor -effect clear @s minecraft:absorption -effect give @s minecraft:absorption infinite 2 true attribute @s minecraft:armor modifier remove ssbrc:adaptive_armor attribute @s minecraft:knockback_resistance modifier add ssbrc:adaptive_armor 0.5 add_value + +effect clear @s minecraft:absorption +execute if score @s charge.1 matches 1 run return run effect give @s minecraft:absorption infinite 1 true +execute if score @s charge.1 matches 2.. run return run effect give @s minecraft:absorption infinite 0 true +effect give @s minecraft:absorption infinite 2 true diff --git a/data/ssbrc/function/fighter/king_k_rool/restore_items.mcfunction b/data/ssbrc/function/fighter/king_k_rool/restore_items.mcfunction index c0f159a89..025cbf8a9 100644 --- a/data/ssbrc/function/fighter/king_k_rool/restore_items.mcfunction +++ b/data/ssbrc/function/fighter/king_k_rool/restore_items.mcfunction @@ -1 +1,3 @@ scoreboard players set @s charge.1 0 + +scoreboard players set @s duration.1 2 diff --git a/data/ssbrc/function/stage/pac_maze/load.mcfunction b/data/ssbrc/function/stage/pac_maze/load.mcfunction index a917de4c6..6a033c6da 100644 --- a/data/ssbrc/function/stage/pac_maze/load.mcfunction +++ b/data/ssbrc/function/stage/pac_maze/load.mcfunction @@ -3,6 +3,6 @@ execute store result score random.output temp run random value 0..1 execute if score random.output temp matches 0 run function ssbrc:stage/pac_maze/load/pac_maze execute if score random.output temp matches 1 run function ssbrc:stage/pac_maze/load/mrs_pac_maze -scoreboard objectives setdisplay list pac_maze.scoreboard +execute if score hazards options matches 1 run scoreboard objectives setdisplay list pac_maze.scoreboard function ssbrc:stage/pac_maze/logic/ghosts/animation/schedule