Skip to content

Commit

Permalink
Adding new sets frontend changes
Browse files Browse the repository at this point in the history
  • Loading branch information
@fribbels
fribbels committed Oct 27, 2022
1 parent 7a0e674 commit bc0bc59
Show file tree
Hide file tree
Showing 24 changed files with 175 additions and 38 deletions.
22 changes: 22 additions & 0 deletions app/app.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -478,6 +478,7 @@
<option value="Destruction" data-t>Destruction</option>
<option value="Injury" data-t>Injury</option>
<option value="Lifesteal" data-t>Lifesteal</option>
<option value="Protection" data-t>Protection</option>
<option value="Rage" data-t>Rage</option>
<option value="Revenge" data-t>Revenge</option>
<option value="Speed" data-t>Speed</option>
Expand All @@ -490,6 +491,7 @@
<option value="Immunity" data-t>Immunity</option>
<option value="Penetration" data-t>Penetration</option>
<option value="Resist" data-t>Resist</option>
<option value="Torrent" data-t>Torrent</option>
<option value="Unity" data-t>Unity</option>
</optgroup>
</select><br>
Expand All @@ -504,6 +506,7 @@
<option value="Immunity" data-t>Immunity</option>
<option value="Penetration" data-t>Penetration</option>
<option value="Resist" data-t>Resist</option>
<option value="Torrent" data-t>Torrent</option>
<option value="Unity" data-t>Unity</option>
</optgroup>
</select><br>
Expand All @@ -518,6 +521,7 @@
<option value="Immunity" data-t>Immunity</option>
<option value="Penetration" data-t>Penetration</option>
<option value="Resist" data-t>Resist</option>
<option value="Torrent" data-t>Torrent</option>
<option value="Unity" data-t>Unity</option>
</optgroup>
</select>
Expand All @@ -534,6 +538,7 @@
<option value="Destruction" data-t>Destruction</option>
<option value="Injury" data-t>Injury</option>
<option value="Lifesteal" data-t>Lifesteal</option>
<option value="Protection" data-t>Protection</option>
<option value="Rage" data-t>Rage</option>
<option value="Revenge" data-t>Revenge</option>
<option value="Speed" data-t>Speed</option>
Expand All @@ -546,6 +551,7 @@
<option value="Immunity" data-t>Immunity</option>
<option value="Penetration" data-t>Penetration</option>
<option value="Resist" data-t>Resist</option>
<option value="Torrent" data-t>Torrent</option>
<option value="Unity" data-t>Unity</option>
</optgroup>
</select><br>
Expand Down Expand Up @@ -845,6 +851,11 @@
<img class="gearTabIcon gearTabIconSet" src="./assets/setlifesteal.png"></img>
</div>
</div>
<div class="gearTabSquareButton">
<div class="gearTabButton" id="protectionSetFilter">
<img class="gearTabIcon gearTabIconSet" src="./assets/setprotection.png"></img>
</div>
</div>
<div class="gearTabSquareButton">
<div class="gearTabButton" id="counterSetFilter">
<img class="gearTabIcon gearTabIconSet" src="./assets/setcounter.png"></img>
Expand Down Expand Up @@ -910,6 +921,11 @@
<img class="gearTabIcon gearTabIconSet" src="./assets/setpenetration.png"></img>
</div>
</div>
<div class="gearTabSquareButton">
<div class="gearTabButton" id="torrentSetFilter">
<img class="gearTabIcon gearTabIconSet" src="./assets/settorrent.png"></img>
</div>
</div>
</div>
</div>
</div>
Expand Down Expand Up @@ -1080,6 +1096,12 @@
<div class="gearTabButtonLabel" data-t>Speed</div>
</div>
</div>
<div class="gearTabLongButton">
<div class="gearTabButton clearSubstatsFilterButton" id="clearSubstatsFilter">
<img class="gearTabIcon" id="clearSubstatsFilterIcon" src="./assets/trash.png" style="opacity:0.8"></img>
<div class="gearTabButtonLabel" data-t>Clear</div>
</div>
</div>
</div>
</div>

Expand Down
Binary file added app/assets/setprotection.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/settorrent.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
26 changes: 15 additions & 11 deletions app/css/style.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1051,6 +1051,10 @@ body.dark-theme input {
background: #E1F4FF;
box-shadow: inset 1px 1px 3px rgba(0, 0, 0, 0.25);
}
.clearSubstatsFilterButton:active {
background: #E1F4FF;
box-shadow: inset 1px 1px 3px rgba(0, 0, 0, 0.25);
}
.gearTabButtonSelected {
background: #E1F4FF; /* #b7e4ff */
box-shadow: inset 1px 1px 3px rgba(0, 0, 0, 0.25);
Expand All @@ -1061,8 +1065,8 @@ body.dark-theme input {
flex-direction: row;
}
.gearTabGearFilter {
min-width: 300px;
width: 300px;
min-width: 290px;
width: 290px;
}
.gearTabSetFilter {
width: 750px;
Expand All @@ -1083,11 +1087,11 @@ body.dark-theme input {
}
.gearTabMainStatFilter {
width: 300px;
margin-right: 30px;
margin-right: 20px;
}
.gearTabSubstatFilter {
width: 300px;
margin-right: 30px;
margin-right: 35px;
}
.gearTabFilterLongRow {
margin-bottom: 6px;
Expand Down Expand Up @@ -1116,18 +1120,18 @@ body.dark-theme input {
margin-left: auto;
}
.gearTabLevelFilter {
width: 65px;
min-width: 65px;
width: 80px;
min-width: 80px;
margin-right: 10px;
}
.gearTabEnhanceFilter {
width: 115px;
min-width: 115px;
width: 130px;
min-width: 130px;
margin-right: 10px;
}
.gearTabDuplicateFilter {
width: 130px;
min-width: 130px;
width: 145px;
min-width: 145px;
margin-right: 30px;
}
.gearTabModifyFilter {
Expand Down Expand Up @@ -1293,7 +1297,7 @@ body.dark-theme input {
.gearTabPreview {
min-width: 210px;
padding: 30px;
padding-right: 20px;
padding-right: 5px;
padding-left: 10px;
}
.optionsExcludeGearFrom {
Expand Down
2 changes: 2 additions & 0 deletions app/js/lib/assets.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ const assetsBySet = {
"RevengeSet": "./assets/setrevenge.png",
"InjurySet": "./assets/setinjury.png",
"PenetrationSet": "./assets/setpenetration.png",
"ProtectionSet": "./assets/setprotection.png",
"TorrentSet": "./assets/settorrent.png",
}

const assetsByElement = {
Expand Down
9 changes: 7 additions & 2 deletions app/js/lib/constants.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ need to move other reused constants into here.

module.exports = {

// Remember to update piecesBySetIndex too
setsByIndex: [
"HealthSet",
"DefenseSet",
Expand All @@ -21,7 +22,9 @@ module.exports = {
"ImmunitySet",
"PenetrationSet",
"RevengeSet",
"InjurySet"
"InjurySet",
"ProtectionSet",
"TorrentSet"
],

piecesBySetIndex: [
Expand All @@ -40,7 +43,9 @@ module.exports = {
2,
2,
4,
4
4,
4,
2,
],

indexByGearType: {
Expand Down
2 changes: 2 additions & 0 deletions app/js/lib/darkmode.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ module.exports = {
$("#subStatDefensePercentFilterIcon").attr("src", "./assets/statdefpercent_dt.png")

$("#clearAllFilterIcon").attr("src", "./assets/trash_dt.png")
$("#clearSubstatsFilterIcon").attr("src", "./assets/trash_dt.png")
$("#duplicateFilterIcon").attr("src", "./assets/copy_dt.png")
$("#unequippedFilterIcon").attr("src", "./assets/unequipped_dt.png")
$("img.tooltipImageLeft").attr("src", "./assets/tooltip_dt.png")
Expand Down Expand Up @@ -83,6 +84,7 @@ module.exports = {
$("#subStatDefensePercentFilterIcon").attr("src", "./assets/statdefpercentdark.png")

$("#clearAllFilterIcon").attr("src", "./assets/trash.png")
$("#clearSubstatsFilterIcon").attr("src", "./assets/trash.png")
$("#duplicateFilterIcon").attr("src", "./assets/copy.png")
$("#unequippedFilterIcon").attr("src", "./assets/unequipped.png")
$("img.tooltipImageLeft").attr("src", "./assets/tooltip.png")
Expand Down
9 changes: 9 additions & 0 deletions app/js/lib/dialog.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -726,6 +726,7 @@ module.exports = {
<option value="Destruction" data-t>${i18next.t("Destruction")}</option>
<option value="Injury" data-t>${i18next.t("Injury")}</option>
<option value="Lifesteal" data-t>${i18next.t("Lifesteal")}</option>
<option value="Protection" data-t>${i18next.t("Protection")}</option>
<option value="Rage" data-t>${i18next.t("Rage")}</option>
<option value="Revenge" data-t>${i18next.t("Revenge")}</option>
<option value="Speed" data-t>${i18next.t("Speed")}</option>
Expand All @@ -738,6 +739,7 @@ module.exports = {
<option value="Immunity" data-t>${i18next.t("Immunity")}</option>
<option value="Penetration" data-t>${i18next.t("Penetration")}</option>
<option value="Resist" data-t>${i18next.t("Resist")}</option>
<option value="Torrent" data-t>${i18next.t("Torrent")}</option>
<option value="Unity" data-t>${i18next.t("Unity")}</option>
</optgroup>
</select><br>
Expand All @@ -752,6 +754,7 @@ module.exports = {
<option value="Immunity" data-t>${i18next.t("Immunity")}</option>
<option value="Penetration" data-t>${i18next.t("Penetration")}</option>
<option value="Resist" data-t>${i18next.t("Resist")}</option>
<option value="Torrent" data-t>${i18next.t("Torrent")}</option>
<option value="Unity" data-t>${i18next.t("Unity")}</option>
</optgroup>
</select><br>
Expand All @@ -766,6 +769,7 @@ module.exports = {
<option value="Immunity" data-t>${i18next.t("Immunity")}</option>
<option value="Penetration" data-t>${i18next.t("Penetration")}</option>
<option value="Resist" data-t>${i18next.t("Resist")}</option>
<option value="Torrent" data-t>${i18next.t("Torrent")}</option>
<option value="Unity" data-t>${i18next.t("Unity")}</option>
</optgroup>
</select>
Expand All @@ -781,6 +785,7 @@ module.exports = {
<option value="Destruction" data-t>${i18next.t("Destruction")}</option>
<option value="Injury" data-t>${i18next.t("Injury")}</option>
<option value="Lifesteal" data-t>${i18next.t("Lifesteal")}</option>
<option value="Protection" data-t>${i18next.t("Protection")}</option>
<option value="Rage" data-t>${i18next.t("Rage")}</option>
<option value="Revenge" data-t>${i18next.t("Revenge")}</option>
<option value="Speed" data-t>${i18next.t("Speed")}</option>
Expand All @@ -793,6 +798,7 @@ module.exports = {
<option value="Immunity" data-t>${i18next.t("Immunity")}</option>
<option value="Penetration" data-t>${i18next.t("Penetration")}</option>
<option value="Resist" data-t>${i18next.t("Resist")}</option>
<option value="Torrent" data-t>${i18next.t("Torrent")}</option>
<option value="Unity" data-t>${i18next.t("Unity")}</option>
</optgroup>
</select><br>
Expand Down Expand Up @@ -1643,6 +1649,9 @@ function getGearSetOptionsHtml(item) {
<option value="PenetrationSet" ${set == "PenetrationSet" ? "selected" : ""}>${i18next.t("Penetration")}</option>
<option value="InjurySet" ${set == "InjurySet" ? "selected" : ""}>${i18next.t("Injury")}</option>
<option value="RevengeSet" ${set == "RevengeSet" ? "selected" : ""}>${i18next.t("Revenge")}</option>
<option value="ProtectionSet" ${set == "ProtectionSet" ? "selected" : ""}>${i18next.t("Protection")}</option>
<option value="TorrentSet" ${set == "TorrentSet" ? "selected" : ""}>${i18next.t("Torrent")}</option>
`
}

Expand Down
4 changes: 3 additions & 1 deletion app/js/lib/enums.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,9 @@ const setEnum = {
'RESIST': 'resist',
'UNITY': 'unity',
'RAGE': 'rage',
'IMMUNITY': 'immunity'
'IMMUNITY': 'immunity',
'TORRENT': 'torrent',
'PROTECTION': 'protection',
};

const rankEnum = {
Expand Down
5 changes: 4 additions & 1 deletion app/js/lib/grids/heroesGrid.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -369,6 +369,7 @@ const fourPieceSets = [
"SpeedSet",
"DestructionSet",
"LifestealSet",
"ProtectionSet",
"CounterSet",
"RageSet",
"RevengeSet",
Expand All @@ -394,7 +395,9 @@ function renderSets(equipment) {
Math.floor(setNames.filter(x => x == "ImmunitySet").length),
Math.floor(setNames.filter(x => x == "PenetrationSet").length),
Math.floor(setNames.filter(x => x == "RevengeSet").length),
Math.floor(setNames.filter(x => x == "InjurySet").length)
Math.floor(setNames.filter(x => x == "InjurySet").length),
Math.floor(setNames.filter(x => x == "ProtectionSet").length),
Math.floor(setNames.filter(x => x == "TorrentSet").length)
]

const sets = [];
Expand Down
12 changes: 7 additions & 5 deletions app/js/lib/grids/itemsGrid.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,8 @@ module.exports = {
immutableData: true,
suppressCellSelection: true,
enableRangeSelection: false,
isExternalFilterPresent: ItemsTab.isExternalFilterPresent,
doesExternalFilterPass: ItemsTab.doesExternalFilterPass,
getRowNodeId: (data) => {
return data.id;
},
Expand Down Expand Up @@ -362,12 +364,12 @@ module.exports = {
itemsGrid.gridOptions.api.getFilterInstance('augmentedStats.' + stat).setModel(null);
}
if (substatFilter) {
const substatFilterComponent = itemsGrid.gridOptions.api.getFilterInstance('augmentedStats.' + substatFilter);
// const substatFilterComponent = itemsGrid.gridOptions.api.getFilterInstance('augmentedStats.' + substatFilter);

substatFilterComponent.setModel({
type: 'notEqual',
filter: 0
});
// substatFilterComponent.setModel({
// type: 'notEqual',
// filter: 0
// });
}

const allowedModsFilterComponent = itemsGrid.gridOptions.api.getFilterInstance('allowedMods');
Expand Down
2 changes: 2 additions & 0 deletions app/js/lib/htmlGenerator.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -469,6 +469,7 @@ const huntImageBySet = {
HitSet: "./assets/reforgeW.png",
DestructionSet: "./assets/reforgeB.png",
LifestealSet: "./assets/reforgeB.png",
ProtectionSet: "./assets/reforgeG.png",
CounterSet: "./assets/reforgeB.png",
ResistSet: "./assets/reforgeB.png",
UnitySet: "./assets/reforgeA.png",
Expand All @@ -477,6 +478,7 @@ const huntImageBySet = {
RevengeSet: "./assets/reforgeC.png",
InjurySet: "./assets/reforgeC.png",
PenetrationSet: "./assets/reforgeC.png",
TorrentSet: "./assets/reforgeC.png",
}


Expand Down
2 changes: 1 addition & 1 deletion app/js/lib/ocr/ocrConverter.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,6 @@ const statOptions = [
];

const setOptions = [
"HealthSet", "DefenseSet", "AttackSet", "SpeedSet", "CriticalSet", "HitSet", "DestructionSet", "LifestealSet", "CounterSet", "ResistSet", "UnitySet", "RageSet", "ImmunitySet", "PenetrationSet", "RevengeSet", "InjurySet"
"HealthSet", "DefenseSet", "AttackSet", "SpeedSet", "CriticalSet", "HitSet", "DestructionSet", "LifestealSet", "CounterSet", "ResistSet", "UnitySet", "RageSet", "ImmunitySet", "PenetrationSet", "RevengeSet", "InjurySet", "ProtectionSet", "TorrentSet"
]

Loading

0 comments on commit bc0bc59

Please sign in to comment.