From 9483de06fb95cc10c776151cdb6543471110dca2 Mon Sep 17 00:00:00 2001 From: theripper93 Date: Tue, 28 Nov 2023 12:41:39 +0100 Subject: [PATCH] a --- packs/macros/{001173.log => 001273.log} | 0 packs/macros/CURRENT | 2 +- packs/macros/LOG | 6 +++--- packs/macros/LOG.old | 6 +++--- packs/macros/MANIFEST-001172 | Bin 52 -> 0 bytes packs/macros/MANIFEST-001272 | Bin 0 -> 52 bytes scripts/patches.js | 3 ++- 7 files changed, 9 insertions(+), 8 deletions(-) rename packs/macros/{001173.log => 001273.log} (100%) delete mode 100644 packs/macros/MANIFEST-001172 create mode 100644 packs/macros/MANIFEST-001272 diff --git a/packs/macros/001173.log b/packs/macros/001273.log similarity index 100% rename from packs/macros/001173.log rename to packs/macros/001273.log diff --git a/packs/macros/CURRENT b/packs/macros/CURRENT index 7a54619..e20feae 100644 --- a/packs/macros/CURRENT +++ b/packs/macros/CURRENT @@ -1 +1 @@ -MANIFEST-001172 +MANIFEST-001272 diff --git a/packs/macros/LOG b/packs/macros/LOG index 21c3d30..1af3c20 100644 --- a/packs/macros/LOG +++ b/packs/macros/LOG @@ -1,3 +1,3 @@ -2023/11/14-23:09:56.341 dc90 Recovering log #1171 -2023/11/14-23:09:56.345 dc90 Delete type=0 #1171 -2023/11/14-23:09:56.345 dc90 Delete type=3 #1170 +2023/11/28-12:34:53.636 7094 Recovering log #1271 +2023/11/28-12:34:53.639 7094 Delete type=0 #1271 +2023/11/28-12:34:53.639 7094 Delete type=3 #1270 diff --git a/packs/macros/LOG.old b/packs/macros/LOG.old index d8d0ab6..d72b575 100644 --- a/packs/macros/LOG.old +++ b/packs/macros/LOG.old @@ -1,3 +1,3 @@ -2023/11/14-19:31:31.688 a5b8 Recovering log #1169 -2023/11/14-19:31:31.692 a5b8 Delete type=0 #1169 -2023/11/14-19:31:31.692 a5b8 Delete type=3 #1168 +2023/11/28-02:28:20.806 dddc Recovering log #1269 +2023/11/28-02:28:20.810 dddc Delete type=0 #1269 +2023/11/28-02:28:20.810 dddc Delete type=3 #1268 diff --git a/packs/macros/MANIFEST-001172 b/packs/macros/MANIFEST-001172 deleted file mode 100644 index c00c41c5d348e7ea4e652151f9fcd61ed1c1a860..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 52 zcmWIhx#Ncn10$nUPHI_dPD+xVQ)NkNd1i5{bAE0?Vo_pAe$jq)k-1z9j7(EGIT@Iz Iak4M~0RFBJnE(I) diff --git a/packs/macros/MANIFEST-001272 b/packs/macros/MANIFEST-001272 new file mode 100644 index 0000000000000000000000000000000000000000..63acf9d3bedd6b0e718053ac3e1ea2e2472f9734 GIT binary patch literal 52 zcmWIhx#Ncn10$nUPHI_dPD+xVQ)NkNd1i5{bAE0?Vo_pAe$n-S^X6O(j7&c{IT@IL Iak4M~01a9Z_W%F@ literal 0 HcmV?d00001 diff --git a/scripts/patches.js b/scripts/patches.js index 2fe7df4..5fc8aa2 100644 --- a/scripts/patches.js +++ b/scripts/patches.js @@ -280,10 +280,11 @@ export function registerWrappers() { } function isDoorVisible(wrapped, ...args) { + debugger; const wall = this.wall; const { advancedVision } = getSceneSettings(wall.scene); const isUI = CONFIG.Levels?.UI?.rangeEnabled && !canvas?.tokens?.controlled[0]; - const elevation = WallHeight.currentTokenElevation//isUI && !canvas.tokens.controlled[0] ? WallHeight.currentTokenElevation : WallHeight._token?.document?.elevation; + const elevation = WallHeight.currentTokenElevation ?? (isUI ? CONFIG.Levels?.UI?.currentRange?.bottom ?? null : null) if (elevation == null || !advancedVision) return wrapped(...args); const {top, bottom} = getWallBounds(wall); let inRange = elevation >= bottom && elevation <= top;