From 0d2aaeae7cf568329de381b2aa840ce4184c577f Mon Sep 17 00:00:00 2001 From: Afro Date: Sun, 27 Oct 2024 11:45:16 -0400 Subject: [PATCH] =?UTF-8?q?=F0=9F=91=94=20change=20special=20reward=20hat?= =?UTF-8?q?=20from=20<=3D=203=20hits=20to=20<=3D=207=20hits=20(#256)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../boss_fight/shared/stop/as_active_player/won.mcfunction | 4 ++-- .../as_active_player/won/give_reward_hat_low_hits.mcfunction | 2 +- .../function/summit/room/cave/setup/text_displays.mcfunction | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/shared/stop/as_active_player/won.mcfunction b/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/shared/stop/as_active_player/won.mcfunction index 8c8f1a731..9d29019dc 100644 --- a/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/shared/stop/as_active_player/won.mcfunction +++ b/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/shared/stop/as_active_player/won.mcfunction @@ -3,10 +3,10 @@ execute unless score @s omegaflowey.player.summit.has_survived_flowey matches 1 scoreboard players add #omegaflowey.telemetry.stats.total_distinct_wins omegaflowey.global.flag 1 # Split rewards based on how many hits the player took -execute if score #omegaflowey.bossfight.player_hit_count omegaflowey.global.flag matches ..3 run \ +execute if score #omegaflowey.bossfight.player_hit_count omegaflowey.global.flag matches ..7 run \ function omegaflowey.entity:directorial/boss_fight/shared/stop/as_active_player/won/give_reward_hat_low_hits -execute if score #omegaflowey.bossfight.player_hit_count omegaflowey.global.flag matches 4.. run \ +execute unless score #omegaflowey.bossfight.player_hit_count omegaflowey.global.flag matches ..7 run \ function omegaflowey.entity:directorial/boss_fight/shared/stop/as_active_player/won/give_reward_hat # Play custom item pickup sound diff --git a/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/shared/stop/as_active_player/won/give_reward_hat_low_hits.mcfunction b/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/shared/stop/as_active_player/won/give_reward_hat_low_hits.mcfunction index ba4ddc5b1..41ac7b1a9 100644 --- a/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/shared/stop/as_active_player/won/give_reward_hat_low_hits.mcfunction +++ b/datapacks/omegaflowey/data/omegaflowey.entity/function/directorial/boss_fight/shared/stop/as_active_player/won/give_reward_hat_low_hits.mcfunction @@ -3,7 +3,7 @@ give @s carved_pumpkin[ \ minecraft:rarity=epic, \ minecraft:enchantment_glint_override=true, \ minecraft:fire_resistant={}, \ - minecraft:item_name='[ { "text": "Survived Omega Flowey in 3 hits or less" } ]', \ + minecraft:item_name='[ { "text": "Survived Omega Flowey in 7 hits or less" } ]', \ minecraft:lore=['[ { "text": "Try wearing me as a hat!", "color": "yellow" } ]'], \ minecraft:max_stack_size=99, \ ] diff --git a/datapacks/omegaflowey/data/omegaflowey.main/function/summit/room/cave/setup/text_displays.mcfunction b/datapacks/omegaflowey/data/omegaflowey.main/function/summit/room/cave/setup/text_displays.mcfunction index 0d8d5ad10..7debce388 100644 --- a/datapacks/omegaflowey/data/omegaflowey.main/function/summit/room/cave/setup/text_displays.mcfunction +++ b/datapacks/omegaflowey/data/omegaflowey.main/function/summit/room/cave/setup/text_displays.mcfunction @@ -378,7 +378,7 @@ summon minecraft:text_display -124.01 43.375 36.3125 { \ line_width: 200, \ see_through: 0b, \ shadow: 0b, \ - text: '{ "text": "Get hit 3 times\\nor less", "color": "aqua" }', \ + text: '{ "text": "Get hit 7 times\\nor less", "color": "aqua" }', \ text_opacity: 255, \ transformation: { \ left_rotation: [0.0f, -0.7071068f, 0.0f, 0.7071068f], \