@@ -28,6 +31,8 @@
+
1 sinergy
+
2 sinergies
diff --git a/app/src/components/home/home.component.scss b/app/src/components/home/home.component.scss
index f2c0312..145b39f 100644
--- a/app/src/components/home/home.component.scss
+++ b/app/src/components/home/home.component.scss
@@ -17,6 +17,7 @@
color: white;
}
}
+
button {
-webkit-border-radius: 4;
-moz-border-radius: 4;
@@ -26,6 +27,19 @@
padding: 10px 20px 10px 20px;
text-decoration: none;
}
+
+ #oneSinergy {
+ color: #5c7edec7;
+ margin: 0% 0.5% 0% 1%;
+ font-weight: bold;
+ }
+
+
+ #twoSinergies {
+ color: #b7de5cc7;
+ margin: 0% 0% 0% 0.5%;
+ font-weight: bold;
+ }
}
#champions{
@@ -68,6 +82,12 @@
height: 4em;
background-size: cover;
background-position: center;
+
+ .checkSelectedChampion{
+ float: right;
+ margin: -15% -15% 0% 0%;
+
+ }
}
.rolesWrap{
@@ -100,6 +120,12 @@
box-shadow: inset 0 0 0 3px #5c7edec7;
}
+ .sinergy2{
+ -webkit-box-shadow: inset 0 0 0 3px #b7de5cc7;
+ -moz-box-shadow: inset 0 0 0 3px #b7de5cc7;
+ box-shadow: inset 0 0 0 3px #b7de5cc7;
+ }
+
.dark {
opacity: 0.3;
}
@@ -117,6 +143,7 @@
display: flex;
align-items: center;
justify-content: center;
+ margin-top: 1%;
.roleSelectedRoles{
float: left;
diff --git a/app/src/components/home/home.component.ts b/app/src/components/home/home.component.ts
index 74a8e99..d1bb4fe 100644
--- a/app/src/components/home/home.component.ts
+++ b/app/src/components/home/home.component.ts
@@ -106,28 +106,32 @@ export class HomeComponent implements OnInit {
* @param role name of role
*/
selectRole(role) {
- this.resetComposition();
- this.selectedRole = role;
- let countChampions = 0;
- this.champions.map( champion => {
- if (_.indexOf(champion.roles, role) !== -1) {
- champion.isSelected = true;
- countChampions++;
- this.championsPool.push(champion);
- champion.roles.forEach( rol => {
- this.rolesCount[rol]++;
- });
- }
- return champion;
- });
- this.updatePool();
- this.updateSinergies();
- this.teamSize = countChampions;
- this.formFilters.patchValue({
- teamSize: this.teamSize
- });
- this.getBonus();
- this.noChampSelected = false;
+ if (role !== this.selectedRole) {
+ this.resetComposition();
+ this.selectedRole = role;
+ let countChampions = 0;
+ this.champions.map( champion => {
+ if (_.indexOf(champion.roles, role) !== -1) {
+ champion.isSelected = true;
+ countChampions++;
+ this.championsPool.push(champion);
+ champion.roles.forEach( rol => {
+ this.rolesCount[rol]++;
+ });
+ }
+ return champion;
+ });
+ this.updatePool();
+ this.updateSinergies();
+ this.teamSize = countChampions;
+ this.formFilters.patchValue({
+ teamSize: this.teamSize
+ });
+ this.getBonus();
+ this.noChampSelected = false;
+ } else {
+ this.resetComposition();
+ }
}
/**
@@ -162,15 +166,26 @@ export class HomeComponent implements OnInit {
*/
updateSinergies() {
this.champions.map(champion => {
- return champion.sinergy = false;
+ champion.sinergy2 = false;
+ return champion.sinergy = false;
});
- this.rolesPool.forEach( role => {
- this.champions.map(champion => {
- if (_.indexOf(champion.roles, role) !== -1 ) {
- return champion.sinergy = true;
+ this.champions.map(champion => {
+ let countRoles = 0;
+ this.rolesPool.forEach( role => {
+ if (_.indexOf(champion.roles, role) !== -1 ) {
+ countRoles++;
+ }
+ });
+ switch (countRoles) {
+ case 1:
+ return champion.sinergy = true;
+ break;
+ case 2:
+ return champion.sinergy2 = true;
+ break;
}
- });
});
+
}
/**
@@ -197,6 +212,7 @@ export class HomeComponent implements OnInit {
this.teamSize = 0;
this.champions.map(champion => {
champion.sinergy = false;
+ champion.sinergy2 = false;
champion.isSelected = false;
return champion;
});
diff --git a/app/src/models/champion.ts b/app/src/models/champion.ts
index 321fb13..a371b68 100644
--- a/app/src/models/champion.ts
+++ b/app/src/models/champion.ts
@@ -4,6 +4,7 @@ export class Champion {
public roles: string[],
public cost: number,
public isSelected: boolean,
- public sinergy: boolean
+ public sinergy: boolean,
+ public sinergy2: boolean
) {}
}
diff --git a/dist/TFTPaths/assets/images/greencheck.png b/dist/TFTPaths/assets/images/greencheck.png
new file mode 100644
index 0000000..7d119ee
Binary files /dev/null and b/dist/TFTPaths/assets/images/greencheck.png differ
diff --git a/dist/TFTPaths/index.html b/dist/TFTPaths/index.html
index e8da851..6b37a19 100644
--- a/dist/TFTPaths/index.html
+++ b/dist/TFTPaths/index.html
@@ -19,5 +19,5 @@
-
+
+