a

theripper93 · theripper93 · commit aa5b4bd9a50b · 2024-06-23T17:30:53.000+02:00
diff --git a/lang/en.json b/lang/en.json
@@ -65,6 +65,10 @@
                 "name": "Reveal token in fog",
                 "hint": "If a token is visible, reveal the fog of war around that token"
             },
+            "strictVisionCheck": {
+                "name": "Strict Vision Check",
+                "hint": "If disabled Darkness light sources will not block sight. If enabled, tokens outside of the vision polygon but visible to 3D sight calculations will be visible."
+            },
             "migrateOnStartup": {
                 "name": "Migrate settings on startup",
                 "hint": "If enabled, the module will migrate the data from the V11 data structure to the V12 one on startup. You can use the macro 'CONFIG.Levels.helpers.migration.showManualMigrationDialog()' to manually migrate your settings."
diff --git a/packs/levels-samples/002631.log b/packs/levels-samples/002631.log
diff --git a/packs/levels-samples/CURRENT b/packs/levels-samples/CURRENT
@@ -1 +1 @@
-MANIFEST-002618
+MANIFEST-002630
diff --git a/packs/levels-samples/LOG b/packs/levels-samples/LOG
@@ -1,3 +1,3 @@
-2024/06/23-15:50:17.936 859c Recovering log #2616
-2024/06/23-15:50:17.940 859c Delete type=0 #2616
-2024/06/23-15:50:17.940 859c Delete type=3 #2614
+2024/06/23-17:17:16.925 8fd4 Recovering log #2628
+2024/06/23-17:17:16.928 8fd4 Delete type=0 #2628
+2024/06/23-17:17:16.928 8fd4 Delete type=3 #2626
diff --git a/packs/levels-samples/LOG.old b/packs/levels-samples/LOG.old
@@ -1,8 +1,8 @@
-2024/06/23-15:29:50.316 604 Recovering log #2612
-2024/06/23-15:29:50.319 604 Delete type=0 #2612
-2024/06/23-15:29:50.319 604 Delete type=3 #2610
-2024/06/23-15:49:25.511 58cc Level-0 table #2617: started
-2024/06/23-15:49:25.511 58cc Level-0 table #2617: 0 bytes OK
-2024/06/23-15:49:25.512 58cc Delete type=0 #2615
-2024/06/23-15:49:25.512 58cc Manual compaction at level-0 from '!scenes!i1noRqT20RD5stIK' @ 72057594037927935 : 1 .. '!scenes.walls!zksLSgRdh6f8jiUO.z5ptMNOLPqAgK6MH' @ 0 : 0; will stop at (end)
-2024/06/23-15:49:25.512 58cc Manual compaction at level-1 from '!scenes!i1noRqT20RD5stIK' @ 72057594037927935 : 1 .. '!scenes.walls!zksLSgRdh6f8jiUO.z5ptMNOLPqAgK6MH' @ 0 : 0; will stop at (end)
+2024/06/23-17:06:07.406 3eb0 Recovering log #2624
+2024/06/23-17:06:07.409 3eb0 Delete type=0 #2624
+2024/06/23-17:06:07.409 3eb0 Delete type=3 #2622
+2024/06/23-17:14:02.610 3190 Level-0 table #2629: started
+2024/06/23-17:14:02.611 3190 Level-0 table #2629: 0 bytes OK
+2024/06/23-17:14:02.612 3190 Delete type=0 #2627
+2024/06/23-17:14:02.613 3190 Manual compaction at level-0 from '!scenes!i1noRqT20RD5stIK' @ 72057594037927935 : 1 .. '!scenes.walls!zksLSgRdh6f8jiUO.z5ptMNOLPqAgK6MH' @ 0 : 0; will stop at (end)
+2024/06/23-17:14:02.613 3190 Manual compaction at level-1 from '!scenes!i1noRqT20RD5stIK' @ 72057594037927935 : 1 .. '!scenes.walls!zksLSgRdh6f8jiUO.z5ptMNOLPqAgK6MH' @ 0 : 0; will stop at (end)
diff --git a/packs/levels-samples/MANIFEST-002630 b/packs/levels-samples/MANIFEST-002630
diff --git a/packs/macros/002626.log b/packs/macros/002626.log
diff --git a/packs/macros/CURRENT b/packs/macros/CURRENT
@@ -1 +1 @@
-MANIFEST-002613
+MANIFEST-002625
diff --git a/packs/macros/LOG b/packs/macros/LOG
@@ -1,3 +1,3 @@
-2024/06/23-15:50:17.929 1694 Recovering log #2611
-2024/06/23-15:50:17.933 1694 Delete type=0 #2611
-2024/06/23-15:50:17.933 1694 Delete type=3 #2609
+2024/06/23-17:17:16.916 3eb0 Recovering log #2623
+2024/06/23-17:17:16.920 3eb0 Delete type=0 #2623
+2024/06/23-17:17:16.920 3eb0 Delete type=3 #2621
diff --git a/packs/macros/LOG.old b/packs/macros/LOG.old
@@ -1,8 +1,8 @@
-2024/06/23-15:29:50.310 6328 Recovering log #2607
-2024/06/23-15:29:50.313 6328 Delete type=0 #2607
-2024/06/23-15:29:50.313 6328 Delete type=3 #2605
-2024/06/23-15:49:25.506 58cc Level-0 table #2612: started
-2024/06/23-15:49:25.506 58cc Level-0 table #2612: 0 bytes OK
-2024/06/23-15:49:25.508 58cc Delete type=0 #2610
-2024/06/23-15:49:25.508 58cc Manual compaction at level-0 from '!macros!2LfY4Ky5rRDkK7h8' @ 72057594037927935 : 1 .. '!macros!yx7Eb76rfzjh0LEO' @ 0 : 0; will stop at (end)
-2024/06/23-15:49:25.508 58cc Manual compaction at level-1 from '!macros!2LfY4Ky5rRDkK7h8' @ 72057594037927935 : 1 .. '!macros!yx7Eb76rfzjh0LEO' @ 0 : 0; will stop at (end)
+2024/06/23-17:06:07.399 69a4 Recovering log #2619
+2024/06/23-17:06:07.403 69a4 Delete type=0 #2619
+2024/06/23-17:06:07.403 69a4 Delete type=3 #2617
+2024/06/23-17:14:02.605 3190 Level-0 table #2624: started
+2024/06/23-17:14:02.605 3190 Level-0 table #2624: 0 bytes OK
+2024/06/23-17:14:02.607 3190 Delete type=0 #2622
+2024/06/23-17:14:02.607 3190 Manual compaction at level-0 from '!macros!2LfY4Ky5rRDkK7h8' @ 72057594037927935 : 1 .. '!macros!yx7Eb76rfzjh0LEO' @ 0 : 0; will stop at (end)
+2024/06/23-17:14:02.607 3190 Manual compaction at level-1 from '!macros!2LfY4Ky5rRDkK7h8' @ 72057594037927935 : 1 .. '!macros!yx7Eb76rfzjh0LEO' @ 0 : 0; will stop at (end)
diff --git a/packs/macros/MANIFEST-002625 b/packs/macros/MANIFEST-002625
diff --git a/scripts/handlers/lightHandler.js b/scripts/handlers/lightHandler.js
@@ -28,7 +28,6 @@ export class LightHandler{
     }
 
     static _isLightSourceDisabled(wrapped, ...args) {
-        debugger
         const result = wrapped(...args);
         const isPreview = this.document?.id == null;
         if(isPreview) return result;
diff --git a/scripts/handlers/settingsHandler.js b/scripts/handlers/settingsHandler.js
@@ -1,6 +1,6 @@
 export class SettingsHandler{
     constructor(){
-        this.settingsKeys = ["tokenElevScale", "tokenElevScaleMultiSett", "fogHiding", "revealTokenInFog", "lockElevation", "hideElevation", "preciseTokenVisibility", "exactTokenVisibility", "enableTooltips"];
+        this.settingsKeys = ["tokenElevScale","tokenElevScaleMultiSett", "fogHiding", "revealTokenInFog", "lockElevation", "hideElevation", "preciseTokenVisibility", "exactTokenVisibility", "enableTooltips"];
     }
 
     get(key){
diff --git a/scripts/handlers/sightHandler.js b/scripts/handlers/sightHandler.js
@@ -265,6 +265,7 @@ export class SightHandler {
                 object: testTarget,
             };
             result = LevelsConfig.handlers.SightHandler.performLOSTest(this.config.source.object, point, this, this.config.type);
+            if(canvas.effects.darknessSources.size) result = result && wrapped(...args);
         } else {
             result = wrapped(...args);
         }

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,6 @@ export class LightHandler{`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`static _isLightSourceDisabled(wrapped, ...args) {`
`31`		`- debugger`
`32`	`31`	`const result = wrapped(...args);`
`33`	`32`	`const isPreview = this.document?.id == null;`
`34`	`33`	`if(isPreview) return result;`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`export class SettingsHandler{`
`2`	`2`	`constructor(){`
`3`		`- this.settingsKeys = ["tokenElevScale", "tokenElevScaleMultiSett", "fogHiding", "revealTokenInFog", "lockElevation", "hideElevation", "preciseTokenVisibility", "exactTokenVisibility", "enableTooltips"];`
	`3`	`+ this.settingsKeys = ["tokenElevScale","tokenElevScaleMultiSett", "fogHiding", "revealTokenInFog", "lockElevation", "hideElevation", "preciseTokenVisibility", "exactTokenVisibility", "enableTooltips"];`
`4`	`4`	`}`
`5`	`5`
`6`	`6`	`get(key){`
Original file line number	Diff line number	Diff line change
`@@ -265,6 +265,7 @@ export class SightHandler {`
`265`	`265`	`object: testTarget,`
`266`	`266`	`};`
`267`	`267`	`result = LevelsConfig.handlers.SightHandler.performLOSTest(this.config.source.object, point, this, this.config.type);`
	`268`	`+ if(canvas.effects.darknessSources.size) result = result && wrapped(...args);`
`268`	`269`	`} else {`
`269`	`270`	`result = wrapped(...args);`
`270`	`271`	`}`