From 9b7408f8d8dfabb5a86bf3f64db4e8739f298706 Mon Sep 17 00:00:00 2001 From: woutkolkman Date: Sat, 13 Jan 2024 17:13:31 +0100 Subject: [PATCH] teleport crosshair now supports sbcamerascroll zoom --- MouseDrag/Tools/Teleport.cs | 17 ++++++++++++++--- MouseDrag/bin/mousedrag/plugins/MouseDrag.dll | Bin 95232 -> 95232 bytes 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/MouseDrag/Tools/Teleport.cs b/MouseDrag/Tools/Teleport.cs index 8218772..0c5d9f0 100644 --- a/MouseDrag/Tools/Teleport.cs +++ b/MouseDrag/Tools/Teleport.cs @@ -1,4 +1,5 @@ using UnityEngine; +using System; namespace MouseDrag { @@ -92,9 +93,19 @@ public void DrawSprites(RoomCamera.SpriteLeaser sLeaser, RoomCamera rCam, float sLeaser?.CleanSpritesAndRemove(); return; } - Vector2 tsPos = Vector2.Lerp(prevPos, curPos, timeStacker); - sLeaser.sprites[0].x = tsPos.x - camPos.x; - sLeaser.sprites[0].y = tsPos.y - camPos.y; + Vector2 tsPos = Vector2.Lerp(prevPos, curPos, timeStacker) - camPos; + + if (Integration.sBCameraScrollEnabled) { + try { + tsPos -= Integration.SBCameraScrollExtraOffset(rCam, tsPos, out float scale) / (1f / scale); + } catch (Exception ex) { + Plugin.Logger.LogError("Teleport.DrawSprites exception while reading SBCameraScroll, integration is now disabled - " + ex.ToString()); + Integration.sBCameraScrollEnabled = false; + } + } + + sLeaser.sprites[0].x = tsPos.x; + sLeaser.sprites[0].y = tsPos.y; } diff --git a/MouseDrag/bin/mousedrag/plugins/MouseDrag.dll b/MouseDrag/bin/mousedrag/plugins/MouseDrag.dll index 1f957311774d247cbe8fe67126ff6a824c95a389..a6a835893ce649ea1cd1344ed438f0b0048da392 100644 GIT binary patch delta 3249 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 bacd=;bY5L0Ju%6*MxPH|D}5z-(*phjxfjF`