From 72406ff2042883fecb879030317f368342fb7bea Mon Sep 17 00:00:00 2001 From: TheAfroOfDoom Date: Mon, 21 Oct 2024 01:34:02 -0400 Subject: [PATCH] =?UTF-8?q?=E2=9A=94=EF=B8=8F=20prevent=20homing-vines-bli?= =?UTF-8?q?nking-lane=20from=20appearing=20aboveground=20when=20player=20i?= =?UTF-8?q?s=20too=20high?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../randomize_indicator_position.mcfunction | 11 +++++++++++ .../attacks/homing-vine-blinking-lane.ajblueprint | 6 +++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/datapacks/omegaflowey/data/omegaflowey.entity/function/hostile/omega-flowey/attack/homing-vines/indicator/initialize/randomize_indicator_position.mcfunction b/datapacks/omegaflowey/data/omegaflowey.entity/function/hostile/omega-flowey/attack/homing-vines/indicator/initialize/randomize_indicator_position.mcfunction index a08a64e1d..c8dfc4297 100644 --- a/datapacks/omegaflowey/data/omegaflowey.entity/function/hostile/omega-flowey/attack/homing-vines/indicator/initialize/randomize_indicator_position.mcfunction +++ b/datapacks/omegaflowey/data/omegaflowey.entity/function/hostile/omega-flowey/attack/homing-vines/indicator/initialize/randomize_indicator_position.mcfunction @@ -20,6 +20,16 @@ execute store result storage omegaflowey:utils.math.min b int 1 run scoreboard p function omegaflowey.utils:math/min execute store result score @s omegaflowey.attack.position.x run data get storage omegaflowey:utils.math.min out +# Bound y-position so it doesn't aim the blinking lane too high, else +# we can see the blinking lane aboveground sometimes +execute store result score @s omegaflowey.attack.position.y run data get entity @s Pos[1] 100 +scoreboard players set @s omegaflowey.math.0 400 +scoreboard players operation @s omegaflowey.math.0 += #omegaflowey.bossfight.summit.origin.y omegaflowey.global.flag +execute store result storage omegaflowey:utils.math.min a int 1 run scoreboard players get @s omegaflowey.math.0 +execute store result storage omegaflowey:utils.math.min b int 1 run scoreboard players get @s omegaflowey.attack.position.y +function omegaflowey.utils:math/min +execute store result score @s omegaflowey.attack.position.y run data get storage omegaflowey:utils.math.min out + # Randomize delta-z-position of indicator at (z: omegaflowey.player.Position.z, dx: [-1.00..1.00]) # TODO(41): validate this dz range execute store result score @s omegaflowey.attack.position.z run data get entity @s Pos[2] 100 @@ -44,4 +54,5 @@ execute store result score @s omegaflowey.attack.position.z run data get storage # Store new position to NBT execute store result entity @s Pos[0] double 0.01 run scoreboard players get @s omegaflowey.attack.position.x +execute store result entity @s Pos[1] double 0.01 run scoreboard players get @s omegaflowey.attack.position.y execute store result entity @s Pos[2] double 0.01 run scoreboard players get @s omegaflowey.attack.position.z diff --git a/resourcepack/assets/omega-flowey/models/entity/hostile/omega-flowey/attacks/homing-vine-blinking-lane.ajblueprint b/resourcepack/assets/omega-flowey/models/entity/hostile/omega-flowey/attacks/homing-vine-blinking-lane.ajblueprint index 1932650c0..d86528230 100644 --- a/resourcepack/assets/omega-flowey/models/entity/hostile/omega-flowey/attacks/homing-vine-blinking-lane.ajblueprint +++ b/resourcepack/assets/omega-flowey/models/entity/hostile/omega-flowey/attacks/homing-vine-blinking-lane.ajblueprint @@ -47,7 +47,7 @@ "render_order": "default", "allow_mirror_modeling": true, "from": [-8, 12, -501.1], - "to": [-7.5, 12, 498.9], + "to": [-7.5, 12, 382.9], "autouv": 0, "color": 3, "origin": [0, 11, 0], @@ -91,7 +91,7 @@ "render_order": "default", "allow_mirror_modeling": true, "from": [7.5, 12, -501.1], - "to": [8, 12, 498.9], + "to": [8, 12, 382.9], "autouv": 0, "color": 3, "origin": [0, 11, 0], @@ -176,7 +176,7 @@ "internal": false, "saved": true, "uuid": "f5af35d5-3b6f-d0f1-08ce-40d942d8a3ea", - "source": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAgCAYAAAAbifjMAAAAAXNSR0IArs4c6QAAADRJREFUSEtjfHlzwn8GCgDjqAEMo2HAMBoGDMMjDBYaGlFWHowawMA4GgajYQAqD4Z+OgAAVXFVYfqulm0AAAAASUVORK5CYII=", + "source": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAgCAYAAAAbifjMAAAAAXNSR0IArs4c6QAAADRJREFUSEtjfHlzwj8GCgDjqAEMo2HAMBoGDMMjDBYaGlFWHowawMA4GgajYQAqD4Z+OgAAz9JVQS8x2WQAAAAASUVORK5CYII=", "mode": "bitmap" } ],