fixed merge conflicts
This commit is contained in:
ferricles
commit
c5f037d1c6
4 changed files with 331 additions and 56 deletions
212
display.js
Normal file
212
display.js
Normal file
|
|
@ -0,0 +1,212 @@
|
|||
let nonRolledIDs = ["name", "displayName", "tier", "set", "slots", "type", "material", "drop", "quest", "restrict", "nDam", "fDam", "wDam", "aDam", "tDam", "eDam", "atkSpd", "hp", "fDef", "wDef", "aDef", "tDef", "eDef", "lvl", "classReq", "strReq", "dexReq", "intReq", "agiReq", "defReq","str", "dex", "int", "agi", "def", "fixID", "category", "id"];
|
||||
let rolledIDs = ["hprPct", "mr", "sdPct", "mdPct", "ls", "ms", "xpb", "lb", "ref", "thorns", "exploding", "spd", "atkTier", "poison", "hpBonus", "spRegen", "eSteal", "hprRaw", "sdRaw", "mdRaw", "fDamPct", "wDamPct", "aDamPct", "tDamPct", "eDamPct", "fDefPct", "wDefPct", "aDefPct", "tDefPct", "eDefPct", "spPct1", "spRaw1", "spPct2", "spRaw2", "spPct3", "spRaw3", "spPct4", "spRaw4", "rainbowRaw", "sprint", "sprintReg", "jh", "lq", "gXp", "gSpd"];
|
||||
let stackingIDs = ["hprPct", "mr", "sdPct", "mdPct", "ls", "ms", "xpb", "lb", "ref", "thorns", "exploding", "spd", "atkTier", "poison", "hpBonus", "spRegen", "eSteal", "hprRaw", "sdRaw", "mdRaw", "fDamPct", "wDamPct", "aDamPct", "tDamPct", "eDamPct", "fDefPct", "wDefPct", "aDefPct", "tDefPct", "eDefPct", "spPct1", "spRaw1", "spPct2", "spRaw2", "spPct3", "spRaw3", "spPct4", "spRaw4", "rainbowRaw", "sprint", "sprintReg", "jh", "lq", "gXp", "gSpd", "fDef", "wDef", "aDef", "tDef", "eDef", "str", "dex", "int", "agi", "def"];
|
||||
let standaloneIDs = ["name", "displayName", "tier", "set", "slots", "type", "material", "drop", "quest", "restrict", "nDam", "fDam", "wDam", "aDam", "tDam", "eDam", "atkSpd", "hp", "lvl", "classReq", "strReq", "dexReq", "intReq", "agiReq", "defReq", "fixID", "category", "id"];
|
||||
|
||||
function expandItem(item){
|
||||
let minRolls = new Map();
|
||||
let maxRolls = new Map();
|
||||
let expandedItem = new Map();
|
||||
if(item.fixID){ //The item has fixed IDs.
|
||||
expandedItem.set("fixID",true);
|
||||
for (const id of rolledIDs){ //all rolled IDs are numerical
|
||||
if(item[id]) {
|
||||
minRolls.set(id,item[id]);
|
||||
maxRolls.set(id,item[id]);
|
||||
}
|
||||
}
|
||||
}else{ //The item does not have fixed IDs.
|
||||
for (const id of rolledIDs){
|
||||
if(item[id]){
|
||||
if(item[id] > 0){ // positive rolled IDs
|
||||
minRolls.set(id,idRound(item[id]*0.3));
|
||||
maxRolls.set(id,idRound(item[id]*1.3));
|
||||
}else if(item[id] < 0){ //negative rolled IDs
|
||||
minRolls.set(id,idRound(item[id]*1.3));
|
||||
maxRolls.set(id,idRound(item[id]*0.7));
|
||||
}else{//Id = 0
|
||||
minRolls.set(id,0);
|
||||
maxRolls.set(id,0);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
for (const id of nonRolledIDs){
|
||||
if(item[id]){
|
||||
expandedItem.set(id,item[id]);
|
||||
}
|
||||
}
|
||||
expandedItem.set("minRolls",minRolls);
|
||||
expandedItem.set("maxRolls",maxRolls);
|
||||
return expandedItem;
|
||||
}
|
||||
|
||||
function displayExpandedItem(item, parent_id){
|
||||
// Commands to "script" the creation of nice formatting.
|
||||
// #commands create a new element.
|
||||
// !elemental is some janky hack for elemental damage.
|
||||
// normals just display a thing.
|
||||
let display_commands = [
|
||||
"#cdiv",
|
||||
"displayName",
|
||||
"#ldiv",
|
||||
"atkSpd",
|
||||
"#ldiv",
|
||||
"!elemental",
|
||||
"hp",
|
||||
"nDam", "eDam", "tDam", "wDam", "tDam", "aDam",
|
||||
"eDef", "tDef", "wDef", "fDef", "aDef",
|
||||
"!elemental",
|
||||
"#ldiv",
|
||||
"classReq",
|
||||
"lvl",
|
||||
"strReq", "dexReq", "intReq", "defReq","agiReq",
|
||||
"#ldiv",
|
||||
"str", "dex", "int", "agi", "def",
|
||||
"#table",
|
||||
"hpBonus",
|
||||
"hprRaw", "hprPct",
|
||||
"sdRaw", "sdPct",
|
||||
"mdRaw", "mdPct",
|
||||
"mr", "ms",
|
||||
"ref", "thorns",
|
||||
"ls",
|
||||
"poison",
|
||||
"exploding",
|
||||
"spd",
|
||||
"atkTier",
|
||||
"!elemental",
|
||||
"eDamPct", "tDamPct", "wDamPct", "fDamPct", "aDamPct",
|
||||
"eDefPct", "tDefPct", "wDefPct", "fDefPct", "aDefPct",
|
||||
"!elemental",
|
||||
"spPct1", "spRaw1", "spPct2", "spRaw2", "spPct3", "spRaw3", "spPct4", "spRaw4",
|
||||
"rainbowRaw",
|
||||
"sprint", "sprintReg",
|
||||
"jh",
|
||||
"xpb", "lb", "lq",
|
||||
"spRegen",
|
||||
"eSteal",
|
||||
"gXp", "gSpd",
|
||||
"#ldiv",
|
||||
"slots",
|
||||
"set",
|
||||
"quest",
|
||||
"restrict"];
|
||||
|
||||
let idPrefixes = {"displayName": "", "lvl":"Combat Level Min: ", "classReq":"Class Req: ","strReq":"Strength Min: ","dexReq":"Dexterity Min: ","intReq":"Intelligence Min: ","defReq":"Defense Min: ","agiReq":"Agility Min: ", "nDam":"Neutral Damage: ", "eDam":"Earth Damage: ", "tDam":"Thunder Damage: ", "wDam":"Water Damage: ", "fDam":"Fire Damage: ", "aDam":"Air Damage: ", "atkSpd":"Attack Speed: ", "hp":"Health : ", "eDef":"Earth Defense: ", "tDef":"Thunder Defense: ", "wDef":"Water Defense: ", "fDef":"Fire Defense: ", "aDef":"Air Defense: ", "str":"Strength: ", "dex":"Dexterity: ", "int":"Intelligence: ", "def":"Defense: ","agi":"Agility: ", "hpBonus":"Health Bonus: ", "hprRaw":"Health Regen Raw: ", "hprPct":"Health Regen %: ", "sdRaw":"Raw Spell Damage: ", "sdPct":"Spell Damage %: ", "mdRaw":"Main Attack Neutral Damage: ", "mdPct":"Main Attack Damage %: ", "mr":"Mana Regen: ", "ms":"Mana Steal: ", "ref":"Reflection: ", "ls":"Life Steal: ", "poison":"Poison: ", "thorns":"Thorns: ", "exploding":"Expoding: ", "spd":"Walk Speed Bonus: ", "atkTier":"Attack Speed Bonus: ", "eDamPct":"Earth Damage %: ", "tDamPct":"Thunder Damage %: ", "wDamPct":"Water Damage %: ", "fDamPct":"Fire Damage %: ", "aDamPct":"Air Damage %: ", "eDefPct":"Earth Defense %: ", "tDefPct":"Thunder Defense %: ", "wDefPct":"Water Defense %: ", "fDefPct":"Fire Defense %: ", "aDefPct":"Air Defense %: ", "spPct1":"1st Spell Cost %: ", "spRaw1":"1st Spell Cost Raw: ", "spPct2":"2nd Spell Cost %: ", "spRaw2":"2nd Spell Cost Raw: ", "spPct3":"3rd Spell Cost %: ", "spRaw3":"3rd Spell Cost Raw: ", "spPct4":"4th Spell Cost %: ", "spRaw4":"4th Spell Cost Raw: ", "rainbowRaw":"Rainbow Spell Damage Raw: ", "sprint":"Sprint Bonus: ", "sprintReg":"Sprint Regen Bonus: ", "jh":"Jump Height: ", "xpb":"Combat XP Bonus: ", "lb":"Loot Bonus: ", "lq":"Loot Quality: ", "spRegen":"Soul Point Regen: ", "eSteal":"Stealing: ", "gXp":"Gathering XP Bonus: ", "gSpd":"Gathering Speed Bonus: ", "slots":"Powder Slots: ", "set":"Set: ", "quest":"Quest Req: ", "restrict":""};
|
||||
let idSuffixes = {"displayName": "", "lvl":"", "classReq":"","strReq":"","dexReq":"","intReq":"","defReq":"","agiReq":"", "nDam":"", "eDam":"", "tDam":"", "wDam":"", "fDam":"", "aDam":"", "atkSpd":"", "hp":"", "eDef":"", "tDef":"", "wDef":"", "fDef":"", "aDef":"", "str":"", "dex":"", "int":"", "def":"","agi":"", "hpBonus":"", "hprRaw":"", "hprPct":"%", "sdRaw":"", "sdPct":"%", "mdRaw":"", "mdPct":"%", "mr":"/4s", "ms":"/4s", "ref":"%", "ls":"/4s", "poison":"/3s", "thorns":"%", "exploding":"%", "spd":"%", "atkTier":" tier", "eDamPct":"%", "tDamPct":"%", "wDamPct":"%", "fDamPct":"%", "aDamPct":"%", "eDefPct":"%", "tDefPct":"%", "wDefPct":"%", "fDefPct":"%", "aDefPct":"%", "spPct1":"%", "spRaw1":"", "spPct2":"%", "spRaw2":"", "spPct3":"%", "spRaw3":"", "spPct4":"%", "spRaw4":"", "rainbowRaw":"", "sprint":"%", "sprintReg":"%", "jh":"", "xpb":"%", "lb":"%", "lq":"%", "spRegen":"%", "eSteal":"%", "gXp":"%", "gSpd":"%", "slots":"", "set":" set.", "quest":"", "restrict":""};
|
||||
|
||||
function apply_elemental_format(p_elem, id, suffix) {
|
||||
suffix = (typeof suffix !== 'undefined') ? suffix : "";
|
||||
// THIS IS SO JANK BUT IM TOO LAZY TO FIX IT TODO
|
||||
let parts = idPrefixes[id].split(/ (.*)/);
|
||||
let element_prefix = parts[0];
|
||||
let desc = parts[1];
|
||||
let i_elem = document.createElement('b');
|
||||
i_elem.classList.add(element_prefix);
|
||||
i_elem.textContent = element_prefix;
|
||||
p_elem.appendChild(i_elem);
|
||||
|
||||
let i_elem2 = document.createElement('b');
|
||||
i_elem2.textContent = " " + desc + suffix;
|
||||
p_elem.appendChild(i_elem2);
|
||||
}
|
||||
|
||||
// Clear the parent div.
|
||||
setHTML(parent_id, "");
|
||||
let parent_div = document.getElementById(parent_id);
|
||||
|
||||
let active_elem;
|
||||
let fix_id = item.has("fixID") && item.get("fixID");
|
||||
let elemental_format = false;
|
||||
for (const command of display_commands) {
|
||||
if (command.charAt(0) === "#") {
|
||||
if (command === "#cdiv") {
|
||||
active_elem = document.createElement('div');
|
||||
active_elem.classList.add('itemcenter');
|
||||
}
|
||||
else if (command === "#ldiv") {
|
||||
active_elem = document.createElement('div');
|
||||
active_elem.classList.add('itemleft');
|
||||
}
|
||||
else if (command === "#table") {
|
||||
active_elem = document.createElement('table');
|
||||
active_elem.classList.add('itemtable');
|
||||
}
|
||||
parent_div.appendChild(active_elem);
|
||||
}
|
||||
else if (command.charAt(0) === "!") {
|
||||
// TODO: This is sooo incredibly janky.....
|
||||
if (command === "!elemental") {
|
||||
elemental_format = !elemental_format;
|
||||
}
|
||||
}
|
||||
else {
|
||||
let id = command;
|
||||
if(nonRolledIDs.includes(id) && item.get(id)){//nonRolledID & non-0/non-null/non-und ID
|
||||
let p_elem = document.createElement('p');
|
||||
p_elem.classList.add('itemp');
|
||||
if (elemental_format) {
|
||||
apply_elemental_format(p_elem, id, item.get(id));
|
||||
}
|
||||
else {
|
||||
p_elem.textContent = idPrefixes[id].concat(item.get(id), idSuffixes[id]);
|
||||
}
|
||||
active_elem.appendChild(p_elem);
|
||||
}
|
||||
else if(rolledIDs.includes(id)&& item.get("minRolls").get(id)){ // && item.get("maxRolls").get(id) ){//rolled ID & non-0/non-null/non-und ID
|
||||
let row = document.createElement('tr');
|
||||
let style = "positive";
|
||||
if (item.get("minRolls").get(id) < 0) {
|
||||
style = "negative";
|
||||
}
|
||||
if (fix_id) {
|
||||
let desc_elem = document.createElement('td');
|
||||
desc_elem.classList.add('left');
|
||||
if (elemental_format) {
|
||||
apply_elemental_format(desc_elem, id);
|
||||
}
|
||||
else {
|
||||
desc_elem.textContent = idPrefixes[id];
|
||||
}
|
||||
row.appendChild(desc_elem);
|
||||
|
||||
let value_elem = document.createElement('td');
|
||||
value_elem.classList.add('right');
|
||||
value_elem.classList.add(style);
|
||||
value_elem.textContent = item.get("minRolls").get(id) + idSuffixes[id];
|
||||
row.appendChild(value_elem);
|
||||
}
|
||||
else {
|
||||
let min_elem = document.createElement('td');
|
||||
min_elem.classList.add('left');
|
||||
min_elem.classList.add(style);
|
||||
min_elem.textContent = item.get("minRolls").get(id) + idSuffixes[id];
|
||||
row.appendChild(min_elem);
|
||||
|
||||
let desc_elem = document.createElement('td');
|
||||
desc_elem.classList.add('center');
|
||||
if (elemental_format) {
|
||||
apply_elemental_format(desc_elem, id);
|
||||
}
|
||||
else {
|
||||
desc_elem.textContent = idPrefixes[id];
|
||||
}
|
||||
row.appendChild(desc_elem);
|
||||
|
||||
let max_elem = document.createElement('td');
|
||||
max_elem.classList.add('right');
|
||||
max_elem.classList.add(style);
|
||||
max_elem.textContent = item.get("maxRolls").get(id) + idSuffixes[id];
|
||||
row.appendChild(max_elem);
|
||||
}
|
||||
active_elem.appendChild(row);
|
||||
}//Just don't do anything if else
|
||||
}
|
||||
}
|
||||
let item_desc_elem = document.createElement('p');
|
||||
item_desc_elem.classList.add('itemp');
|
||||
item_desc_elem.classList.add('left');
|
||||
item_desc_elem.textContent = item.get("tier")+" "+item.get("type");
|
||||
parent_div.append(item_desc_elem);
|
||||
}
|
||||
|
|
@ -1,12 +1,16 @@
|
|||
<!DOCTYPE html>
|
||||
<html scroll-behavior="smooth">
|
||||
<head>
|
||||
<!-- nunito font, copying wynndata -->
|
||||
<link rel="preconnect" href="https://fonts.gstatic.com">
|
||||
<link href="https://fonts.googleapis.com/css2?family=Nunito&display=swap" rel="stylesheet">
|
||||
|
||||
<link rel="stylesheet" href="styles.css">
|
||||
<link rel="icon" href="favicon.png">
|
||||
<link rel="manifest" href="manifest.json">
|
||||
<title>Wynn Clientside</title>
|
||||
</head>
|
||||
<body>
|
||||
<body class="all">
|
||||
<div class="header" id="header">
|
||||
Wynn build calculator
|
||||
</div>
|
||||
|
|
@ -219,6 +223,7 @@
|
|||
|
||||
<script type="text/javascript" src="utils.js"></script>
|
||||
<script type="text/javascript" src="skillpoints.js"></script>
|
||||
<script type="text/javascript" src="display.js"></script>
|
||||
<script type="text/javascript" src="build.js"></script>
|
||||
<script type="text/javascript" src="load.js"></script>
|
||||
<script type="text/javascript" src="test.js"></script>
|
||||
|
|
|
|||
105
styles.css
105
styles.css
|
|
@ -3,6 +3,11 @@
|
|||
text-align: center;
|
||||
}
|
||||
|
||||
.all {
|
||||
font-family: 'Nunito',sans-serif;
|
||||
font-weight: 700;
|
||||
}
|
||||
|
||||
.equipment {
|
||||
padding: 4%;
|
||||
display: grid;
|
||||
|
|
@ -20,7 +25,15 @@
|
|||
}
|
||||
|
||||
.center {
|
||||
text-align: center;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.right {
|
||||
text-align: right;
|
||||
}
|
||||
|
||||
.left {
|
||||
text-align: left;
|
||||
}
|
||||
|
||||
.build{
|
||||
|
|
@ -29,10 +42,96 @@
|
|||
grid-template-columns: repeat(4, 1fr);
|
||||
gap: 10px;
|
||||
grid-auto-rows: minmax(60px, auto);
|
||||
width: 90vw;
|
||||
width: 98%;
|
||||
}
|
||||
.build-helmet, .build-chestplate, .build-leggings, .build-boots, .build-ring1, .build-ring2, .build-bracelet, .build-necklace, .build-weapon, .build-order {
|
||||
color: #aaa;
|
||||
background: #110110;
|
||||
border: 2px solid black;
|
||||
border-radius: 3px;
|
||||
width: 20vw;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.itemcenter {
|
||||
text-align: center;
|
||||
margin-bottom: 16px;
|
||||
}
|
||||
|
||||
.itemleft {
|
||||
text-align: left;
|
||||
margin-bottom: 16px;
|
||||
}
|
||||
|
||||
.itemtable {
|
||||
margin: 2px 2%;
|
||||
width: 96%;
|
||||
margin-bottom: 16px;
|
||||
}
|
||||
|
||||
.itemp {
|
||||
margin: 2px 2%;
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
.positive {
|
||||
color: #5f5;
|
||||
/*text-shadow: 2px 2px 0 #153f15;*/
|
||||
}
|
||||
|
||||
.negative {
|
||||
color: #f55;
|
||||
/*text-shadow: 2px 2px 0 #1f1515;*/
|
||||
}
|
||||
|
||||
.Earth {
|
||||
color: #0a0;
|
||||
/*text-shadow: 2px 2px 0 #002a00;*/
|
||||
}
|
||||
.Earth:before {
|
||||
content: "\2724" ' ';
|
||||
}
|
||||
|
||||
.Thunder {
|
||||
color: #ff5;
|
||||
/*text-shadow: 2px 2px 0 #3f3f15;*/
|
||||
}
|
||||
.Thunder:before {
|
||||
content: "\2726" ' ';
|
||||
}
|
||||
|
||||
.Water {
|
||||
color: #5ff;
|
||||
/*text-shadow: 2px 2px 0 #153f3f;*/
|
||||
}
|
||||
.Water:before {
|
||||
content: "\2749" ' ';
|
||||
}
|
||||
|
||||
.Fire {
|
||||
color: #f55;
|
||||
/*text-shadow: 2px 2px 0 #1f1515;*/
|
||||
}
|
||||
.Fire:before {
|
||||
content: "\2739" ' ';
|
||||
}
|
||||
|
||||
.Air {
|
||||
color: #fff;
|
||||
/*text-shadow: 2px 2px 0 #3f3f3f;*/
|
||||
}
|
||||
.Air:before {
|
||||
content: "\274b" ' ';
|
||||
}
|
||||
|
||||
.Neutral {
|
||||
color: #fa0;
|
||||
/*text-shadow: 2px 2px 0 #2a2a00;*/
|
||||
}
|
||||
|
||||
.Health {
|
||||
color: #a00;
|
||||
/*text-shadow: 2px 2px 0 #2a0000;*/
|
||||
}
|
||||
.Health:before {
|
||||
content: "\2764" ' ';
|
||||
}
|
||||
|
|
|
|||
63
test.js
63
test.js
|
|
@ -11,7 +11,7 @@ console.log(url_tag);
|
|||
* END testing section
|
||||
*/
|
||||
|
||||
const BUILD_VERSION = "1.0";
|
||||
const BUILD_VERSION = "1.1";
|
||||
|
||||
document.getElementById("header").textContent = "Wynn build calculator "+BUILD_VERSION+" (db version "+DB_VERSION+")";
|
||||
|
||||
|
|
@ -290,15 +290,15 @@ function calculateBuild(){
|
|||
|
||||
setHTML("summary-box", "Summary: Assigned "+player_build.assigned_skillpoints+" skillpoints.");
|
||||
|
||||
setHTML("build-helmet", expandedItemToString(expandItem(player_build.helmet)));
|
||||
setHTML("build-chestplate", expandedItemToString(expandItem(player_build.chestplate)));
|
||||
setHTML("build-leggings", expandedItemToString(expandItem(player_build.leggings)));
|
||||
setHTML("build-boots", expandedItemToString(expandItem(player_build.boots)));
|
||||
setHTML("build-ring1", expandedItemToString(expandItem(player_build.ring1)));
|
||||
setHTML("build-ring2", expandedItemToString(expandItem(player_build.ring2)));
|
||||
setHTML("build-bracelet", expandedItemToString(expandItem(player_build.bracelet)));
|
||||
setHTML("build-necklace", expandedItemToString(expandItem(player_build.necklace)));
|
||||
setHTML("build-weapon", expandedItemToString(expandItem(player_build.weapon)));
|
||||
displayExpandedItem(expandItem(player_build.helmet), "build-helmet");
|
||||
displayExpandedItem(expandItem(player_build.chestplate), "build-chestplate");
|
||||
displayExpandedItem(expandItem(player_build.leggings), "build-leggings");
|
||||
displayExpandedItem(expandItem(player_build.boots), "build-boots");
|
||||
displayExpandedItem(expandItem(player_build.ring1), "build-ring1");
|
||||
displayExpandedItem(expandItem(player_build.ring2), "build-ring2");
|
||||
displayExpandedItem(expandItem(player_build.bracelet), "build-bracelet");
|
||||
displayExpandedItem(expandItem(player_build.necklace), "build-necklace");
|
||||
displayExpandedItem(expandItem(player_build.weapon), "build-weapon");
|
||||
let meleeStats = player_build.getMeleeStats();
|
||||
//nDamAdj,eDamAdj,tDamAdj,wDamAdj,fDamAdj,aDamAdj,totalDamNorm,totalDamCrit,normDPS,critDPS,avgDPS
|
||||
let meleeSummary = "";
|
||||
|
|
@ -352,48 +352,6 @@ function calculateBuild(){
|
|||
/* Helper function that gets stats ranges for wearable items.
|
||||
@param item - an item in Object format.
|
||||
*/
|
||||
function expandItem(item){
|
||||
let minRolls = new Map();
|
||||
let maxRolls = new Map();
|
||||
let expandedItem = new Map();
|
||||
if(item.fixID){ //The item has fixed IDs.
|
||||
expandedItem.set("fixID",true);
|
||||
for (const id in rolledIDs){ //all rolled IDs are numerical
|
||||
if(item[rolledIDs[id]]){
|
||||
minRolls.set(rolledIDs[id],item[rolledIDs[id]]);
|
||||
maxRolls.set(rolledIDs[id],item[rolledIDs[id]]);
|
||||
}
|
||||
}
|
||||
for (id in nonRolledIDs){
|
||||
if(item[nonRolledIDs[id]]){
|
||||
expandedItem.set(nonRolledIDs[id],item[nonRolledIDs[id]]);
|
||||
}
|
||||
}
|
||||
}else{ //The item does not have fixed IDs.
|
||||
for (const id in rolledIDs){
|
||||
if(item[rolledIDs[id]]){
|
||||
if(item[rolledIDs[id]] > 0){ // positive rolled IDs
|
||||
minRolls.set(rolledIDs[id],idRound(item[rolledIDs[id]]*0.3));
|
||||
maxRolls.set(rolledIDs[id],idRound(item[rolledIDs[id]]*1.3));
|
||||
}else if(item[rolledIDs[id]] < 0){ //negative rolled IDs
|
||||
minRolls.set(rolledIDs[id],idRound(item[rolledIDs[id]]*1.3));
|
||||
maxRolls.set(rolledIDs[id],idRound(item[rolledIDs[id]]*0.7));
|
||||
}else{//Id = 0
|
||||
minRolls.set(rolledIDs[id],0);
|
||||
maxRolls.set(rolledIDs[id],0);
|
||||
}
|
||||
}
|
||||
}
|
||||
for (const id in nonRolledIDs){
|
||||
if(item[nonRolledIDs[id]]){
|
||||
expandedItem.set(nonRolledIDs[id],item[nonRolledIDs[id]]);
|
||||
}
|
||||
}
|
||||
}
|
||||
expandedItem.set("minRolls",minRolls);
|
||||
expandedItem.set("maxRolls",maxRolls);
|
||||
return expandedItem;
|
||||
}
|
||||
/* A second helper function that takes items from expandItem() and stringifies them.
|
||||
@param item - a map with non-rolled Ids as normal key:value pairs and all rolled IDs as 2 separate key:value pairs in the minRoll and maxRoll keys that are mapped to maps.
|
||||
TODO: write the function
|
||||
|
|
@ -464,6 +422,7 @@ function resetFields(){
|
|||
setValue("int-skp", "0");
|
||||
setValue("def-skp", "0");
|
||||
setValue("agi-skp", "0");
|
||||
location.hash = "";
|
||||
}
|
||||
|
||||
load_init(init);
|
||||
|
|
|
|||
Loading…
Reference in a new issue