Skip to content

Commit

Permalink
Merge pull request #99 from brendanprice2003/Ver-5.6+
Browse files Browse the repository at this point in the history
0.5.6 into main
  • Loading branch information
dev-brendanprice authored Apr 11, 2023
2 parents 52b74d9 + 2aea1b7 commit 811bb20
Show file tree
Hide file tree
Showing 70 changed files with 2,228 additions and 2,373 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "d2-synergy",
"version": "0.5.0",
"version": "0.5.6",
"description": "[![Version](https://img.shields.io/badge/Version-ALPHA-yellow)](https://github.com/brendanprice2003/D2Synergy_v0.3)\r [![API](https://img.shields.io/badge/API-Bungie.net-blue)](https://bungie-net.github.io/multi/index.html)",
"main": "index.js",
"scripts": {
Expand Down
4 changes: 2 additions & 2 deletions src/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
<link rel="stylesheet" href="styles/viewports.css">

<meta content="width=device-width, initial-scale=1" name="viewport" />
<link rel="icon" href="./static/ico/xp_icon.ico">
<link rel="shortcut icon" href="./static/ico/xp_icon.ico">
<!-- <link rel="icon" href="./static/ico/destiny-icons/xp_icon.ico">
<link rel="shortcut icon" href="./static/ico/destiny-icons/xp_icon.ico"> -->
<meta charset="UTF-8">

<title>D2 Synergy</title>
Expand Down
11 changes: 6 additions & 5 deletions src/scripts/modules/AddTableRow.js
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@

// Add a new row to a defined table
// @object {table}, @array {data}
export function AddTableRow(table, data = ['', '', '']) {
export function AddTableRow(table, data = ['', '']) {

// data param
// 0, Item Name / 1, Category / 2, Relation
// "data" parameter
// 0, Item name
// 1, Item relation count

// Insert new row using data parameter
const row = table.insertRow(-1);

// Insert data into cells
for (let i=0; i<data.length; i++) {
// Iterate over data array and insert each item into a row. Push row to DOM
for (let i=0; i < data.length; i++) {
row.insertCell(i).innerHTML = data[i];
};
};
2 changes: 1 addition & 1 deletion src/scripts/modules/CalcXpYield.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { CacheReturnItem } from './CacheReturnItem.js';
export async function CalcXpYield(bountyArr, itemTypeKeys, baseYields, petraYields) {

var totalXP = 0;
var includeExpiredBounties = await CacheReturnItem('includeExpiredBounties');
var includeExpiredBounties = await CacheReturnItem('includeExpiredBountiesInTable');

// Self func
function DiffXP(bounty, bountyType) {
Expand Down
Loading

0 comments on commit 811bb20

Please sign in to comment.