Skip to content

Commit

Permalink
Puzzle x16779 (#154)
Browse files Browse the repository at this point in the history
1. Added background
2. Added details
3. New system to link x14186 to x16779, since they are the same
  • Loading branch information
mgatelabs authored Mar 15, 2022
1 parent e86fbe5 commit 3c00d6d
Show file tree
Hide file tree
Showing 5 changed files with 44 additions and 7 deletions.
12 changes: 10 additions & 2 deletions src/app/data-source.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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 || ''
)
);

Expand All @@ -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;
Expand Down
3 changes: 2 additions & 1 deletion src/app/location-info.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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 = ''
) {}
}
2 changes: 1 addition & 1 deletion src/app/map/map.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Binary file added src/assets/backgrounds/x16779.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
34 changes: 31 additions & 3 deletions src/assets/location_cubes.json
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down

0 comments on commit 3c00d6d

Please sign in to comment.