diff --git a/src/app/data-source.service.ts b/src/app/data-source.service.ts index 596bf89..8cb6e8d 100644 --- a/src/app/data-source.service.ts +++ b/src/app/data-source.service.ts @@ -104,7 +104,12 @@ export class DataSourceService { item.id, Number(item.x), y, - item.type ? LocationType.SPINNING : LocationType.BROKEN + item.type + ? LocationType.SPINNING + : item.link + ? LocationType.SPINNING + : LocationType.BROKEN, + item.link || '' ) ); @@ -114,7 +119,10 @@ export class DataSourceService { islandRef[0] += 1; - if (item.type) { + if (item.link) { + this.workingPuzzles++; + islandRef[1] += 1; + } else if (item.type) { this.workingPuzzles++; let puzzleType: PuzzleType; diff --git a/src/app/location-info.ts b/src/app/location-info.ts index 480f88c..a2602fd 100644 --- a/src/app/location-info.ts +++ b/src/app/location-info.ts @@ -5,6 +5,7 @@ export class LocationInfo { public id: String, public x: number, public y: number, - public type: LocationType + public type: LocationType, + public link: string = '' ) {} } diff --git a/src/app/map/map.component.ts b/src/app/map/map.component.ts index cb7d9ae..3d279c3 100644 --- a/src/app/map/map.component.ts +++ b/src/app/map/map.component.ts @@ -146,7 +146,7 @@ export class MapComponent implements AfterViewInit, OnChanges { let content: string = ''; - let id = info.id; + let id = info.link || info.id; switch (this.dataSource.locations[i].type) { case LocationType.WAYPOINT: diff --git a/src/assets/backgrounds/x16779.jpg b/src/assets/backgrounds/x16779.jpg new file mode 100644 index 0000000..37de559 Binary files /dev/null and b/src/assets/backgrounds/x16779.jpg differ diff --git a/src/assets/location_cubes.json b/src/assets/location_cubes.json index 8353943..81316b6 100644 --- a/src/assets/location_cubes.json +++ b/src/assets/location_cubes.json @@ -30,7 +30,30 @@ { "id": "x18705", "x": 1833, "y": 8126, "island": "tsur" }, { "id": "x18703", "x": 1824.19, "y": 8113.5, "island": "tsur" }, - { "id": "x16779", "x": 2724.3940071973902, "y": 6406.28, "island": "seir" }, + { + "id": "x16779", + "x": 2724.3940071973902, + "y": 6406.28, + "count": "4", + "type": "LIGHT", + "camera": [0, 1.0, 4], + "face": "E", + "description": "This puzzle is on two different islands, use the bush to jump betweem them.", + "connection": [ + [1, 3], + [0, 2], + [1, 3], + [3, 0] + ], + "direction": ["1", "1", "2", "2"], + "position": [ + [-2.5, -2.25, -1], + [-4.25, 3.25, -1], + [3.5, 2, -1], + [2.75, -2.45, -1] + ], + "island": "seir" + }, { "id": "x16786", "x": 3439.5, @@ -509,8 +532,13 @@ { "id": "x14189", "x": 2220, "y": 5679.5, "island": "kann" }, { "id": "x14188", "x": 2155, "y": 5835.5, "island": "kann" }, { "id": "x14187", "x": 2532, "y": 6073.5, "island": "kann" }, - { "id": "x14186", "x": 2565.5, "y": 6271, "island": "kann" }, - + { + "id": "x14186", + "link": "x16779", + "x": 2565.5, + "y": 6271, + "island": "kann" + }, { "id": "x14467", "x": 1626,