kitchen-simulator 11.11.0 → 11.12.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -2462,6 +2462,7 @@ function tryAdjacent(ct1, ct2) {
|
|
|
2462
2462
|
}
|
|
2463
2463
|
log('----tryAdjacent', ct1.id, ct2.id);
|
|
2464
2464
|
if (!ct2.catid.includes('Dishwasher') && !ct2.catid.includes('BF') && ct1.catid != ct2.catid) return false;
|
|
2465
|
+
if (ct1.items[0].layoutpos === 'Vanity' || ct2.items[0].layoutpos === 'Vanity') return false;
|
|
2465
2466
|
if (ct1.rotRad != ct2.rotRad) return false;
|
|
2466
2467
|
log('ct1', ct1.pos.x, ct1.pos.y, ct1.size.width);
|
|
2467
2468
|
log('ct2', ct2.pos.x, ct2.pos.y, ct2.size.width);
|
|
@@ -284,7 +284,7 @@ function _parseTempPlaceholdersFromCabinetPayload() {
|
|
|
284
284
|
var phname = tempPlaceholders[0].name;
|
|
285
285
|
var newph = undefined;
|
|
286
286
|
var blAdd = true;
|
|
287
|
-
if (cabinetPayload.is_corner) {
|
|
287
|
+
if (cabinetPayload.is_corner && cabinetPayload.is_corner !== -1) {
|
|
288
288
|
if (tempData['base_door' + t.name.slice(-2)][0].isLeftPlaceholder()) {
|
|
289
289
|
newph = tempPlaceholders.find(function (el) {
|
|
290
290
|
return el.name.isLeftPlaceholder();
|
|
@@ -2496,6 +2496,7 @@ function tryAdjacent(ct1, ct2) {
|
|
|
2496
2496
|
}
|
|
2497
2497
|
log('----tryAdjacent', ct1.id, ct2.id);
|
|
2498
2498
|
if (!ct2.catid.includes('Dishwasher') && !ct2.catid.includes('BF') && ct1.catid != ct2.catid) return false;
|
|
2499
|
+
if (ct1.items[0].layoutpos === 'Vanity' || ct2.items[0].layoutpos === 'Vanity') return false;
|
|
2499
2500
|
if (ct1.rotRad != ct2.rotRad) return false;
|
|
2500
2501
|
log('ct1', ct1.pos.x, ct1.pos.y, ct1.size.width);
|
|
2501
2502
|
log('ct2', ct2.pos.x, ct2.pos.y, ct2.size.width);
|
|
@@ -297,7 +297,7 @@ function _parseTempPlaceholdersFromCabinetPayload() {
|
|
|
297
297
|
var phname = tempPlaceholders[0].name;
|
|
298
298
|
var newph = undefined;
|
|
299
299
|
var blAdd = true;
|
|
300
|
-
if (cabinetPayload.is_corner) {
|
|
300
|
+
if (cabinetPayload.is_corner && cabinetPayload.is_corner !== -1) {
|
|
301
301
|
if (tempData['base_door' + t.name.slice(-2)][0].isLeftPlaceholder()) {
|
|
302
302
|
newph = tempPlaceholders.find(function (el) {
|
|
303
303
|
return el.name.isLeftPlaceholder();
|