slaguru666/roll20-character-sheets-tester
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Only prints the books that actually had new spells, instead of printing all books

Browse Source
This commit is contained in:
Peter Bjerg Lidegaard
2022-01-12 08:59:33 +01:00
parent dd1cd29b9c
commit d69bc6b297
3 changed files with 30 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ADnD 2E Revised/2ESheet.html
+15 -11
View File
@@ -28,6 +28,7 @@
<li>Added Weapons, Spells, and Proficiencies from The Complete Ranger's Handbook</li>
<li>Added Proficiencies from The Complete Paladin's Handbook</li>
<li>Added Spells from The Complete Druid's Handbook</li>
<li>Fixed a bug with the priest sphere Add-spells button, that prevented it from correctly adding spells based on elemental spheres</li>
</ul>
<hr>
<p>
@@ -40923,7 +40924,7 @@ const calculateFormula = async function(formulaField, calculatedField, silent =
});
}
const showToast = function(type, title, message) {
const getToastObject = function (type, title, message) {
let content
switch (type) {
case SUCCESS: content = 1; break;
@@ -40931,12 +40932,16 @@ const showToast = function(type, title, message) {
case WARNING: content = 3; break;
case ERROR: content = 4; break;
}
setAttrs({
return {
['toast']: 1,
['toast-content']: content,
[`toast-title-${type}`]: title,
[`toast-message-${type}`]: message
});
}
}
const showToast = function(type, title, message) {
setAttrs(getToastObject(type, title, message));
}
const isBookInactive = function (books, obj) {
@@ -41609,13 +41614,11 @@ function setupAddPriestSpell(postfix) {
return;
}
let booksReadFrom = new Set();
let spellsToAdd = [];
for (const [spellName, spell] of Object.entries(priestSpells[postfix])) {
let isAvailable = isSpellAvailable(spellName, spell, primarySpheres, elementalSpheres, attrSet);
if (isAvailable) {
spellsToAdd.push(spellName);
booksReadFrom.add(spell['book']);
spellsToAdd.push({name: spellName, book: spell['book']});
}
}
@@ -41625,20 +41628,21 @@ function setupAddPriestSpell(postfix) {
return;
}
spellsToAdd = spellsToAdd.filter(spell => !knownSpells.has(spell));
spellsToAdd = spellsToAdd.filter(spell => !knownSpells.has(spell.name));
console.log(spellsToAdd);
if (spellsToAdd.length < 1) {
showToast(INFO, 'All spells added', `Found no more spells to add based on spheres`);
return;
}
let newValue = {};
let books = [...new Set(spellsToAdd.map(s => `\n • ${s.book}`))].join('');
let toastObject = getToastObject(SUCCESS, 'Added new spells!', `Spells was added from the following books:${books}`);
let newValue = {...toastObject};
spellsToAdd.forEach(spell => {
let newrowid = generateRowID();
newValue[`repeating_${section}_${newrowid}_${field}`] = spell;
newValue[`repeating_${section}_${newrowid}_${field}`] = spell.name;
});
let books = Array.from(booksReadFrom).map(s => `\n • ${s}`).join('');
showToast(SUCCESS, 'Added new spells!', `Spells was added from the following books:${books}`);
setAttrs(newValue);
ADnD 2E Revised/html/2ESheet-base.html
+1
View File
@@ -28,6 +28,7 @@
<li>Added Weapons, Spells, and Proficiencies from The Complete Ranger's Handbook</li>
<li>Added Proficiencies from The Complete Paladin's Handbook</li>
<li>Added Spells from The Complete Druid's Handbook</li>
<li>Fixed a bug with the priest sphere Add-spells button, that prevented it from correctly adding spells based on elemental spheres</li>
</ul>
<hr>
<p>
ADnD 2E Revised/javascript/sheetWorkers.js
+14 -11
View File
@@ -86,7 +86,7 @@ const calculateFormula = async function(formulaField, calculatedField, silent =
});
}
const showToast = function(type, title, message) {
const getToastObject = function (type, title, message) {
let content
switch (type) {
case SUCCESS: content = 1; break;
@@ -94,12 +94,16 @@ const showToast = function(type, title, message) {
case WARNING: content = 3; break;
case ERROR: content = 4; break;
}
setAttrs({
return {
['toast']: 1,
['toast-content']: content,
[`toast-title-${type}`]: title,
[`toast-message-${type}`]: message
});
}
}
const showToast = function(type, title, message) {
setAttrs(getToastObject(type, title, message));
}
const isBookInactive = function (books, obj) {
@@ -772,13 +776,11 @@ function setupAddPriestSpell(postfix) {
return;
}
let booksReadFrom = new Set();
let spellsToAdd = [];
for (const [spellName, spell] of Object.entries(priestSpells[postfix])) {
let isAvailable = isSpellAvailable(spellName, spell, primarySpheres, elementalSpheres, attrSet);
if (isAvailable) {
spellsToAdd.push(spellName);
booksReadFrom.add(spell['book']);
spellsToAdd.push({name: spellName, book: spell['book']});
}
}
@@ -788,20 +790,21 @@ function setupAddPriestSpell(postfix) {
return;
}
spellsToAdd = spellsToAdd.filter(spell => !knownSpells.has(spell));
spellsToAdd = spellsToAdd.filter(spell => !knownSpells.has(spell.name));
console.log(spellsToAdd);
if (spellsToAdd.length < 1) {
showToast(INFO, 'All spells added', `Found no more spells to add based on spheres`);
return;
}
let newValue = {};
let books = [...new Set(spellsToAdd.map(s => `\n • ${s.book}`))].join('');
let toastObject = getToastObject(SUCCESS, 'Added new spells!', `Spells was added from the following books:${books}`);
let newValue = {...toastObject};
spellsToAdd.forEach(spell => {
let newrowid = generateRowID();
newValue[`repeating_${section}_${newrowid}_${field}`] = spell;
newValue[`repeating_${section}_${newrowid}_${field}`] = spell.name;
});
let books = Array.from(booksReadFrom).map(s => `\n • ${s}`).join('');
showToast(SUCCESS, 'Added new spells!', `Spells was added from the following books:${books}`);
setAttrs(newValue);