${itemDescriptionSplit[1]}`; + // itemDesc.innerHTML = itemDescriptionSplit[0] + '.' + '
' + itemDescriptionSplit[1]; // Assign content to parent - document.querySelector(`#item_${param.hash}`).append(itemTitle, itemType, hr, itemDesc); + itemHeader.append(itemTitle, itemType); + document.querySelector(`#item_${param.hash}`).append(itemHeader); // Create item progress and push to DOM - let rootIndex = param.objectiveDefinitions, completionCounter = 0; + let rootIndex = param.objectiveDefinitions; + let completionCounter = 0; for (let indexCount = 0; indexCount < rootIndex.length; indexCount++) { - let itemPrgContainer = document.createElement('div'); - let itemPrgCounter = document.createElement('div'); + let itemPrgCounter = document.createElement('div'); let itemPrgDesc = document.createElement('div'); + let objectiveContainer = document.createElement('div'); + let objectiveCheckbox = document.createElement('div'); + let objectiveCheckboxOuter = document.createElement('div'); + let objectiveCheckboxMiddle = document.createElement('div'); + let objectiveCheckboxInner = document.createElement('div'); // Check if progess string exceeds char limit if (rootIndex[indexCount].progressDescription.length >= 24) { @@ -67,33 +80,51 @@ export async function MakeBountyElement(param) { rootIndex[indexCount].progressDescription = rt + '..'; }; - itemPrgContainer.className = 'itemPrgContainer'; + // Give item progress attributes their style itemPrgCounter.className = 'itemPrgCounter'; itemPrgDesc.className = 'itemPrgDesc'; itemPrgCounter.id = `prgCounter_${rootIndex[indexCount].hash}`; itemPrgDesc.id = `prgDesc_${rootIndex[indexCount].hash}`; - itemPrgContainer.appendChild(itemPrgDesc); - itemPrgContainer.appendChild(itemPrgCounter); - itemObjectivesContainer.appendChild(itemPrgContainer); - document.querySelector(`#item_${param.hash}`).appendChild(itemObjectivesContainer); + // Create objective checkboxes + objectiveContainer.className = 'objectiveContainer'; + objectiveCheckboxOuter.className = 'objectiveCheckboxOuter'; + objectiveCheckboxOuter.id = `Outer_${rootIndex[indexCount].hash}`; + objectiveCheckboxMiddle.className = 'objectiveCheckboxMiddle'; + objectiveCheckboxMiddle.id = `Middle_${rootIndex[indexCount].hash}`; + objectiveCheckboxInner.className = 'objectiveCheckboxInner'; + objectiveCheckboxInner.id = `Inner_${rootIndex[indexCount].hash}`; + objectiveCheckboxOuter.appendChild(objectiveCheckboxMiddle); + objectiveCheckboxMiddle.appendChild(objectiveCheckboxInner); + objectiveCheckbox.appendChild(objectiveCheckboxOuter); + + // Add checkbox and item progress to flex container + objectiveContainer.append(objectiveCheckbox, itemPrgDesc, itemPrgCounter); + itemObjectivesContainer.append(objectiveContainer); + + itemAttributes.appendChild(itemDesc); + itemAttributes.appendChild(itemObjectivesContainer); + document.querySelector(`#item_${param.hash}`).appendChild(itemAttributes); // Render item objective progress itemPrgDesc.innerHTML = rootIndex[indexCount].progressDescription; - param.progress.forEach(h => { - if (h.objectiveHash === rootIndex[indexCount].hash) { + param.progress.forEach(v => { + if (v.objectiveHash === rootIndex[indexCount].hash) { // Render objective progress if (rootIndex[indexCount].completionValue === 100) { - itemPrgCounter.innerHTML = `${h.progress}%`; + itemPrgCounter.innerHTML = `${v.progress}%`; } else if (rootIndex[indexCount].completionValue !== 100) { - itemPrgCounter.innerHTML = `${h.progress}/${h.completionValue}`; + itemPrgCounter.innerHTML = `${v.progress}/${v.completionValue}`; }; // Check if objective is completed - if (h.complete) { + if (v.complete) { completionCounter++; + document.getElementById(`Outer_${v.objectiveHash}`).style.border = '1.5px solid var(--completedCheckboxOuter)'; + document.getElementById(`Middle_${v.objectiveHash}`).style.border = '1.5px solid var(--completedCheckboxMiddle)'; + document.getElementById(`Inner_${v.objectiveHash}`).style.backgroundColor = 'var(--completedCheckboxInner)'; }; }; }); @@ -103,6 +134,7 @@ export async function MakeBountyElement(param) { if (param.progress.length === completionCounter) { // Change areObjectivesComplete boolean param.areObjectivesComplete = true; + } else if (param.progress.length !== completionCounter) { // Change areObjectivesComplete boolean @@ -113,46 +145,28 @@ export async function MakeBountyElement(param) { if (param.isExpired && !param.areObjectivesComplete) { itemStatus.classList += ` expire`; itemStatus.id = `expire_${param.hash}`; - itemStatus.src = './static/ico/pursuit_expired.svg'; + itemStatus.src = './static/ico/destiny-icons/pursuit_expired.svg'; document.getElementById(`bounty_${param.hash}`).style.border = '1px solid rgba(179,73,73, 0.749)'; } else if (param.areObjectivesComplete) { itemStatus.classList += ` complete`; itemStatus.id = `complete_${param.hash}`; - itemStatus.src = './static/ico/pursuit_completed.svg'; + itemStatus.src = './static/ico/destiny-icons/pursuit_completed.svg'; document.getElementById(`bounty_${param.hash}`).style.border = '1px solid rgba(182,137,67, 0.749)'; }; // Append the item status to the item itemContainer.appendChild(itemStatus); - // document.querySelector(`#bountyItems`).append(itemStatus); - // Watch for mouse events + // Watch for mouse move event (when mouse hovers over bounty element) itemContainer.addEventListener('mousemove', function (e) { itemOverlay.style.position = 'absolute'; itemOverlay.style.display = 'block'; - // let itemOverlayPos = parseInt(itemOverlay.style.left.split('px')[0]); - // let itemOverlayWidth = 210; - itemOverlay.style.left = `${e.pageX}px`; itemOverlay.style.top = `${e.pageY}px`; - // if (((window.innerWidth - itemOverlayWidth) >= itemOverlayPos)) { - // // console.log(((window.innerWidth - itemOverlayWidth) >= itemOverlayPos)); - // itemOverlay.style.left = `${e.pageX}px`; - // itemOverlay.style.top = `${e.pageY}px`; - // return; - // }; - - // if (!((window.innerWidth - itemOverlayWidth) >= itemOverlayPos)) { - // // console.log(((window.innerWidth - itemOverlayWidth) >= itemOverlayPos)); - // itemOverlay.style.left = `${window.innerWidth - (itemOverlayWidth + 10)}px`; - // itemOverlay.style.top = `${e.pageY}px`; - // return; - // }; - }); itemContainer.addEventListener('mouseleave', (e) => { diff --git a/src/scripts/modules/MakeCharacterSelect.js b/src/scripts/modules/MakeCharacterSelect.js new file mode 100644 index 0000000..6cfcc50 --- /dev/null +++ b/src/scripts/modules/MakeCharacterSelect.js @@ -0,0 +1,76 @@ + +// Make a character select that is displayed on the top left +// @object {info} +export function MakeCharacterSelect (info) { + + // Make div elements + let characterSelect = document.createElement('div'); + let characterBg = document.createElement('div'); + let characterClassIco = document.createElement('img'); + let characterEmblemIco = document.createElement('img'); + let characterInfo = document.createElement('div'); + let characterClass = document.createElement('div'); + let characterRace = document.createElement('div'); + let characterPowerCon = document.createElement('div'); + let powerIcon = document.createElement('img'); + let characterPower = document.createElement('div'); + + // Add css classes (style) to div elements + characterSelect.className = 'characterSelect'; + characterBg.className = 'characterBg'; + characterClassIco.className = 'characterClassIco'; + characterEmblemIco.className = 'characterEmblemIco'; + characterInfo.className = 'characterInfo'; + characterClass.className = 'characterClass'; + characterRace.className = 'characterRace'; + characterPowerCon.className = 'characterPowerCon'; + powerIcon.className = 'powerIcon'; + characterPower.className = 'characterPower'; + + // Add hierarchy to div elements + characterBg.appendChild(characterClassIco); + characterSelect.appendChild(characterBg); + characterSelect.appendChild(characterEmblemIco); + characterInfo.appendChild(characterClass); + characterInfo.appendChild(characterRace); + characterSelect.appendChild(characterInfo); + characterPowerCon.appendChild(powerIcon); + characterPowerCon.appendChild(characterPower); + characterSelect.appendChild(characterPowerCon); + + // Add values (and data attr) to corresponding div elements + characterEmblemIco.src = `https://www.bungie.net${info.emblemIco}`; + characterClass.innerHTML = info.characterClass; + characterRace.innerHTML = info.characterRace; + characterPower.innerHTML = info.characterPower; + characterSelect.dataset.characterId = info.characterId; + powerIcon.src = 'static/ico/destiny-icons/power2.svg'; + + // Check character class and change div elements + if (info.characterClass === 'Titan') { + + characterClassIco.src = 'static/ico/destiny-icons/class_titan.svg'; + characterClassIco.style.filter = 'invert(21%) sepia(47%) saturate(1408%) hue-rotate(317deg) brightness(100%) contrast(90%)'; + characterBg.style.background = 'linear-gradient(90deg,#89323800 50%,#89323866)'; + } + else if (info.characterClass === 'Warlock') { + + // Warlock requires some custom styling + characterClassIco.src = 'static/ico/destiny-icons/class_warlock.svg'; + characterClassIco.style.filter = 'invert(63%) sepia(26%) saturate(1130%) hue-rotate(6deg) brightness(87%) contrast(87%)'; + characterClassIco.style.marginTop = '-30px'; + characterClassIco.style.marginRight = '27px'; + characterClassIco.style.width = '50%'; + characterBg.style.background = 'linear-gradient(90deg,#b68f2800 50%,#b68f2866)'; + } + else if (info.characterClass === 'Hunter') { + + characterClassIco.src = 'static/ico/destiny-icons/class_hunter.svg'; + characterClassIco.style.filter = 'invert(50%) sepia(44%) saturate(267%) hue-rotate(144deg) brightness(87%) contrast(85%)'; + characterBg.style.background = 'linear-gradient(90deg,#5c828b00 50%,#5c828b66)'; + }; + + // Add parent element to DOM (defaultCharacterSelect) + document.getElementById('defaultCharacterSelect').appendChild(characterSelect); + +}; diff --git a/src/scripts/modules/ModuleScript.js b/src/scripts/modules/ModuleScript.js index 0cfcd79..5f2b988 100644 --- a/src/scripts/modules/ModuleScript.js +++ b/src/scripts/modules/ModuleScript.js @@ -1,3 +1,10 @@ + +/* + + None of these functions are used so they are marked as deprecated, for now. + +*/ + import { itemTypeKeys } from "./SynergyDefinitions.js"; import { allProgressionProperties, UserProfile, log } from "../user.js"; import { LoadCharacter } from './LoadCharacter.js'; diff --git a/src/scripts/modules/ParseBounties.js b/src/scripts/modules/ParseBounties.js index a124fef..cacc0b9 100644 --- a/src/scripts/modules/ParseBounties.js +++ b/src/scripts/modules/ParseBounties.js @@ -1,5 +1,5 @@ -import { excludedBountiesByVendor } from '../user.js'; -import { VendorHashesByLabel } from './SynergyDefinitions.js'; +import { excludedBountiesByVendor, log } from '../user.js'; +import { VendorHashesByLabel, progressionItemGroupTypes } from './SynergyDefinitions.js'; import { stringMatchProgressionItem } from './StringMatchProgressionItem.js'; import { ReplaceStringVariables } from './ReplaceStringVariables.js'; @@ -60,6 +60,43 @@ export function ParseBounties(charInventory, charObjectives, itemDefinitions) { item.isComplete = true; }; + /* + Set isRepeatable to false if the stackUniqueLabel includes 'repeatable' + This won't work correctly as stackUniqueLabel has no standardized format that it follows + + Repeatable bounties almost always state the *group type via the itemTypeDisplayName. + *Group type (crucible, gunsmith, vanguard, etc) + Daily bounties almost always state the group type via the displayProperties.description + This is why we are making this check to ensure the item has its group type present in props + + // Pending on deletion or refactor/re-use + */ + if (item.inventory.stackUniqueLabel.includes('repeatable')) { + + // Add bounty group type to item.props + item.isRepetable = true; + // item.props.push(item.itemTypeDisplayName.split(' ')[0]); + } + else { + + item.isRepetable = false; + + // // Add bounty group type to item.props + // let itemGroupTypes = progressionItemGroupTypes.map(v => v.toLowerCase()); + // let stackUniqueLabel = item.inventory.stackUniqueLabel.split('.'); + // let groupTypeProps = []; + + // itemGroupTypes.forEach(v => { + // if (stackUniqueLabel.includes(v)) { + // groupTypeProps.push(v); + // }; + // }); + + // if (groupTypeProps.length > 0) { + // item.props.push(groupTypeProps); + // }; + }; + // Push bounty item to charBounties and increment amountOfBounties charBounties.push(item); amountOfBounties++; diff --git a/src/scripts/modules/ParseChar.js b/src/scripts/modules/ParseChar.js deleted file mode 100644 index 6dcf779..0000000 --- a/src/scripts/modules/ParseChar.js +++ /dev/null @@ -1,24 +0,0 @@ - -// Returns corresponding class name string using classType or vice versa -// @int {classType} @bool {isReverse} -export function ParseChar(classType, isReverse = false) { - - if (classType === 0 || classType === 'Titan') { - if (!isReverse) { - return 'Titan'; - }; - return 0; - } - else if (classType === 1 || classType === 'Hunter') { - if (!isReverse) { - return 'Hunter'; - }; - return 1; - } - else if (classType === 2 || classType === 'Warlock') { - if (!isReverse) { - return 'Warlock'; - }; - return 2; - }; -}; \ No newline at end of file diff --git a/src/scripts/modules/ParseClass.js b/src/scripts/modules/ParseClass.js new file mode 100644 index 0000000..40a76da --- /dev/null +++ b/src/scripts/modules/ParseClass.js @@ -0,0 +1,27 @@ + +// Returns corresponding class name string using classType or vice versa +// @int {classType} @bool {isReverse} +export function ParseClass(classType, isReverse = false) { + + // If isReverse then we are turning the string version of the class, back into its number form + if (isReverse) { + switch (classType) { + case 'Titan': + return 0; + case 'Hunter': + return 1; + case 'Warlock': + return 2; + }; + }; + + // Return corresponding string + switch (classType) { + case 0: + return 'Titan'; + case 1: + return 'Hunter'; + case 2: + return 'Warlock'; + }; +}; \ No newline at end of file diff --git a/src/scripts/modules/ParseProgressItems.js b/src/scripts/modules/ParseProgressItems.js index 561a9c4..0a0ca46 100644 --- a/src/scripts/modules/ParseProgressItems.js +++ b/src/scripts/modules/ParseProgressItems.js @@ -10,7 +10,8 @@ import { itemDefinitions, objectiveDefinitions, UserProfileProgressions, - progressionDefinitions} from '../user.js'; + progressionDefinitions, + UserProfile } from '../user.js'; import { MakeBountyElement } from './MakeBountyElement.js'; import { ParseSeasonalChallenges } from './ParseSeasonalChallenges.js'; import { ReturnSeasonPassProgressionStats } from './ReturnSeasonPassProgressionStats.js'; @@ -62,14 +63,18 @@ export async function ParseProgressionalItems(CharacterObjectives, CharacterInve document.getElementById('ghostModsCheckmarkIcon').style.filter = filterToResetCheckmark; // Get all seasonal challenges - let allSeasonalChallenges = await ParseSeasonalChallenges(2809059433, seasonDefinitions, recordDefinitions, presentationNodeDefinitions, null); - returnObj.challenges = allSeasonalChallenges; // Add to return object + let currentSeasonalChallenges = await ParseSeasonalChallenges(UserProfile.currentSeasonHash, seasonProgressionInfo); + returnObj.challenges = currentSeasonalChallenges; // Add to return object - // Parse seasonal challenges into corresponding objects - let completedChallenges = {}, - notCompletedChallenges = {}, - allSeasonalChallengesAndTheirDivs = {}; + // Separate challenges based on their completion status + let completedChallenges = {}; + let notCompletedChallenges = {}; + let allSeasonalChallengesAndTheirDivs = {}; + let completedChallengesCount = 0; + let notCompletedChallengesCount = 0; + + // Add objectives to (all) seasonal challenges for (const recordHash in characterRecords) { const objectives = characterRecords[recordHash].objectives; @@ -88,59 +93,80 @@ export async function ParseProgressionalItems(CharacterObjectives, CharacterInve }; }; - // Create HTML elements for seasonal challenges - for (const challengeHash in allSeasonalChallenges) { + for (let challengeHash in currentSeasonalChallenges) { // Create HTML element for challenge - let challengeContainer = document.createElement('div'), - challengeIcon = document.createElement('img'), - challengeName = document.createElement('div'), - challengeBreakline = document.createElement('hr'), - challengeDescription = document.createElement('div'), - challengeProgressContainer = document.createElement('div'), - challengeProgressTrack = document.createElement('div'), - challengeProgressPercentBar = document.createElement('div'); + let challengeContainer = document.createElement('div'); + let challengeHeadingContainer = document.createElement('div'); + let challengeHeadingAttributeContainer = document.createElement('div'); + let challengeIcon = document.createElement('img'); + let challengeName = document.createElement('div'); + let challengeDescription = document.createElement('div'); + let challengeProgressContainer = document.createElement('div'); + let challengeProgressTrack = document.createElement('div'); + let challengeProgressPercentBar = document.createElement('div'); + let challengeRewardsContainer = document.createElement('div'); + let challengeProgressAttributesContainer = document.createElement('div'); // Set attributes for challenge container challengeContainer.className = 'challengeContainer'; + challengeHeadingContainer.className = 'challengeHeadingContainer'; + challengeHeadingAttributeContainer.className = 'challengeHeadingAttributeContainer'; challengeContainer.id = `${challengeHash}`; challengeIcon.className = 'challengeIcon'; challengeName.className = 'challengeName'; - challengeBreakline.className = 'challengeBreakline'; challengeDescription.className = 'challengeDescription'; challengeProgressContainer.className = 'challengeProgressContainer'; challengeProgressTrack.className = 'challengeProgressTrack'; challengeProgressPercentBar.className = 'challengeProgressPercentBar'; + challengeRewardsContainer.className = 'challengeRewardsContainer'; + challengeProgressAttributesContainer.className = 'challengeProgressAttributesContainer'; // Set attributes for content - challengeDescription.innerHTML = allSeasonalChallenges[challengeHash].displayProperties.description; - challengeName.innerHTML = allSeasonalChallenges[challengeHash].displayProperties.name; - challengeIcon.src = `https://www.bungie.net${allSeasonalChallenges[challengeHash].displayProperties.icon}`; + challengeDescription.innerHTML = currentSeasonalChallenges[challengeHash].displayProperties.description; + challengeName.innerHTML = currentSeasonalChallenges[challengeHash].displayProperties.name; + challengeIcon.src = `https://www.bungie.net${currentSeasonalChallenges[challengeHash].displayProperties.icon}`; challengeContainer.style.userSelect = 'none'; // Check if challenge is completed if (completedChallenges[challengeHash]) { - challengeContainer.style.border = '1px solid #b39a36'; + + challengeContainer.classList.add('challengeContainerComplete'); + currentSeasonalChallenges[challengeHash].isComplete = true; + + // Check if challenge has been claimed + let destinyProfileRecords = UserProfile.destinyUserProfile.characterRecords.data[characterId].records; + if (destinyProfileRecords[challengeHash]) { + + if (destinyProfileRecords[challengeHash].state === 0) { + currentSeasonalChallenges[challengeHash].isClaimed = false; + challengeContainer.classList.remove('challengeContainerComplete'); + challengeContainer.classList.add('challengeContainerCompletedNotClaimed'); + } + else if (destinyProfileRecords[challengeHash].state === 1) { + currentSeasonalChallenges[challengeHash].isClaimed = true; + }; + }; + + } + else { + challengeContainer.classList.add('challengeContainerNotComplete'); + currentSeasonalChallenges[challengeHash].isComplete = false; }; // Append all the content together - challengeProgressContainer.appendChild(challengeProgressTrack); - challengeProgressContainer.appendChild(challengeProgressPercentBar); - challengeContainer.appendChild(challengeIcon); - challengeContainer.appendChild(challengeName); - challengeContainer.appendChild(challengeBreakline); - challengeContainer.appendChild(challengeDescription); - challengeContainer.appendChild(challengeProgressContainer); + challengeHeadingContainer.append(challengeIcon, challengeHeadingAttributeContainer); + challengeHeadingAttributeContainer.append(challengeName, challengeDescription); + challengeContainer.appendChild(challengeHeadingContainer); // Store the challenge and its div allSeasonalChallengesAndTheirDivs[challengeHash] = {}; allSeasonalChallengesAndTheirDivs[challengeHash].container = challengeContainer; - allSeasonalChallengesAndTheirDivs[challengeHash].challenge = allSeasonalChallenges[challengeHash]; + allSeasonalChallengesAndTheirDivs[challengeHash].challenge = currentSeasonalChallenges[challengeHash]; // Append objectives to the challenge allSeasonalChallengesAndTheirDivs[challengeHash].challenge.objectives = []; - if (notCompletedChallenges[challengeHash] || completedChallenges[challengeHash]) { let challengeObjectives; @@ -149,7 +175,7 @@ export async function ParseProgressionalItems(CharacterObjectives, CharacterInve if (Object.keys(notCompletedChallenges).includes(challengeHash)) { challengeObjectives = notCompletedChallenges[challengeHash].objectives; - for (const objective in challengeObjectives) { + for (let objective in challengeObjectives) { allSeasonalChallengesAndTheirDivs[challengeHash].challenge.objectives.push(notCompletedChallenges[challengeHash].objectives[objective]); }; }; @@ -158,31 +184,120 @@ export async function ParseProgressionalItems(CharacterObjectives, CharacterInve if (Object.keys(completedChallenges).includes(challengeHash)) { challengeObjectives = completedChallenges[challengeHash].objectives; - for (const objective in challengeObjectives) { + for (let objective in challengeObjectives) { allSeasonalChallengesAndTheirDivs[challengeHash].challenge.objectives.push(completedChallenges[challengeHash].objectives[objective]); }; }; }; + // Add objective element to challenge + for (let objective of currentSeasonalChallenges[challengeHash].objectives) { + + // Objective container + let objectiveContainer = document.createElement('div'); + + // Checkbox + let objectiveCheckboxOuter = document.createElement('div'); + let objectiveCheckboxMiddle = document.createElement('div'); + let objectiveCheckboxInner = document.createElement('div'); + + // Checkbox style + objectiveCheckboxOuter.className = 'objectiveCheckboxOuter'; + objectiveCheckboxMiddle.className = 'objectiveCheckboxMiddle'; + objectiveCheckboxInner.className = 'objectiveCheckboxInner'; + + // Progress bar (objectiveAttributes doubles as a container) + let objectiveAttributes = document.createElement('div'); + let objectiveName = document.createElement('div'); + let objectiveProgress = document.createElement('div'); + + // Progress bar style + objectiveAttributes.className = 'objectiveAttributes'; + objectiveContainer.className = 'objectiveContainer'; + objectiveName.className = 'objectiveName'; + objectiveProgress.className = 'objectiveProgress'; + + // InnerHTML values etc + objectiveName.innerHTML = objectiveDefinitions[objective.objectiveHash].progressDescription || 'Completed'; + objectiveProgress.innerHTML = `${objective.progress}/${objective.completionValue}`; + + // If objective is complete + if (objective.complete) { + + // Change innerHTML to avoid overflow values + objectiveProgress.innerHTML = `${objective.completionValue}/${objective.completionValue}`; + + // Change checkbox style + objectiveCheckboxOuter.style.borderColor = 'var(--challengeCompletedCheckboxOuter)'; + objectiveCheckboxMiddle.style.borderColor = 'var(--challengeCompletedCheckboxMiddle)'; + objectiveCheckboxInner.style.backgroundColor = 'var(--challengeCompletedCheckboxInner)'; + + // Change attribute container style (to children too) + objectiveName.style.color = '#BABABA'; + objectiveProgress.style.color = '#BABABA'; + objectiveAttributes.style.color = '#494949'; + }; + + // Append elements to their parents + objectiveCheckboxOuter.appendChild(objectiveCheckboxMiddle); + objectiveCheckboxMiddle.appendChild(objectiveCheckboxInner); + objectiveAttributes.append(objectiveName, objectiveProgress); + + // Push elements to top-most parent + objectiveContainer.append(objectiveCheckboxOuter, objectiveAttributes); + + // Push objectives to parent container + challengeProgressAttributesContainer.appendChild(objectiveContainer); + + }; + challengeContainer.appendChild(challengeProgressAttributesContainer); + + // Add reward items to the challenge + if (currentSeasonalChallenges[challengeHash].rewardItems) { + + let challengeRewardItems = currentSeasonalChallenges[challengeHash].rewardItems; + for (let reward of challengeRewardItems) { + + let rewardContainer = document.createElement('div'); + let rewardName = document.createElement('div'); + let rewardIcon = document.createElement('img'); + + rewardContainer.className = 'singleChallengeRewardContainer'; + rewardName.innerHTML = itemDefinitions[reward.itemHash].displayProperties.name; + rewardIcon.src = `https://www.bungie.net${itemDefinitions[reward.itemHash].displayProperties.icon}`; + rewardName.className = 'challengeRewardName'; + rewardIcon.className = 'challengeRewardIcon'; + + rewardContainer.append(rewardIcon, rewardName); + challengeRewardsContainer.appendChild(rewardContainer); + }; + + challengeContainer.appendChild(challengeRewardsContainer); + }; + // Check if the challenge is completed, set isComplete to true in guard statement, otherwise false by default // This is to make it easier to check if the challenge is complete, as opposed to comparing with completedChallenges - allSeasonalChallengesAndTheirDivs[challengeHash].challenge.isComplete = false; if (completedChallenges[challengeHash]) { + completedChallengesCount++; allSeasonalChallengesAndTheirDivs[challengeHash].challenge.isComplete = true; + } + else { + notCompletedChallengesCount++; + allSeasonalChallengesAndTheirDivs[challengeHash].challenge.isComplete = false; }; // Sort challenge completion progress as a percentage of the total completion value - let challengeObjectiveProgressTotal = 0, - challengeObjectiveCompletionTotal = 0, - challengeObjectives = allSeasonalChallengesAndTheirDivs[challengeHash].challenge.objectives; + let challengeObjectiveProgressTotal = 0; + let challengeObjectiveCompletionTotal = 0; + let challengeObjectives = allSeasonalChallengesAndTheirDivs[challengeHash].challenge.objectives; - for (const objective of challengeObjectives) { - challengeObjectiveProgressTotal += objective.progress; - challengeObjectiveCompletionTotal += objective.completionValue; + for (const objective in challengeObjectives) { + challengeObjectiveProgressTotal += challengeObjectives[objective].progress; + challengeObjectiveCompletionTotal += challengeObjectives[objective].completionValue; }; - // Calculate progress as a percentage, if objective is "0/1" then it is a boolean, - // so set progress to 0% (if not complete) or 100% (if complete) + // Calculate progress as a percentage, if objective is "0/1" then it is a boolean, + // so set progress (if not complete) or 100% (if complete, avoid overflow) allSeasonalChallengesAndTheirDivs[challengeHash].challenge.completionPercentage = (challengeObjectiveProgressTotal / challengeObjectiveCompletionTotal) * 100; // Change width of challengeProgressPercentBar based on completion percentage @@ -192,46 +307,63 @@ export async function ParseProgressionalItems(CharacterObjectives, CharacterInve else { challengeProgressPercentBar.style.width = `${allSeasonalChallengesAndTheirDivs[challengeHash].challenge.completionPercentage}%`; }; + }; - // Sort challenges by completion percentage, in ascending order + + // Sort challenges by completion percentage, in ascending order (so the completed ones are at the end) let sortedChallenges = Object.values(allSeasonalChallengesAndTheirDivs).sort((a, b) => a.challenge.completionPercentage - b.challenge.completionPercentage); - // Slice the array of challenges into chunks of 6 - let chunkedChallenges = []; - for (let i=0; i
@@ -44,15 +44,15 @@
-
-
- 
+ 
+
Bounties
- 
+ 
+
Seasonal
- 
+ 
+
Statistics
@@ -61,15 +61,6 @@
-
-
-
-
-
-
-
@@ -128,14 +119,18 @@
General Options
Refresh data every 2 minutes
- @@ -229,94 +224,6 @@
Additional Options
-
-
-
-
-
-
-
-
-
-
-
- ![]()
-
-
-
-
-
-
- ![]()
-
-
-
-
-
-
- ![]()
-
-
-
-
- Seasonal Challenges
- Bounties
-
-
-
-
-
- 
-
-
- Base Yield
- This is NOT calculated with any XP modifiers.
-
-
-
-
-
- XP:
-
SP Levels:
-
-
-
- Net Breakdown
-
-
-
-
- 
- 
-
-
-
-
- Bonus XP
-
- 
-
-
-
-
-
-
-
-
-
- Ghost Mods
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Net XP:
-
@@ -348,7 +255,7 @@
@@ -357,30 +264,35 @@
Additional Options
Warlock
- 
+ 
+
9999
Additional Options
-
- 
-
-
-
-
-
@@ -394,23 +306,36 @@
-
-
- ----
+
+
+
-
- ![]()
-
-
-
-
- ----
-
- ![]()
-
-
-
+
- ----
- Additional Options
+
-
-
-
-
- XP:
000,000,000
+
+
+
+
-
@@ -475,47 +408,129 @@ Season Pass Levels:
000
Artifact
-
-
-
+
+
-
Artifact Power Bonus Levels:
- 0000
+
+
+
+ Artifact
+
+
+
+
-
-
@@ -452,15 +377,23 @@ Artifact Mod Levels:
- 0000
+
+
+
+ Power Bonus Levels:
+ 0000
+
+
Mod Levels:
+ 0000
+ Additional Options
Join a fireteam for shared wisdom
- (boots on ground)
+
+
Include expired bounties in yield
+
+
Include unclaimed challenges in yield
+ Additional Options
420
Relations Found
+ 
+ 
+ 
+ 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
+ 
-
- 
-