diff --git a/ShadowbaneInquisition/Shadowbane.html b/ShadowbaneInquisition/Shadowbane.html index 878b3c254a..97abd099bf 100644 --- a/ShadowbaneInquisition/Shadowbane.html +++ b/ShadowbaneInquisition/Shadowbane.html @@ -450,12 +450,12 @@ value='0' selected='selected' >N/A +0 - - - - - - + + + + + + { getAttrs([ 'repeating_advancements_advancement_nameR_r', @@ -5055,27 +5057,27 @@ NOTE: replace worker by javascript for IDE functionality if (firstAptitude && secondAptitude) { if (level === '+5') return 100 - if (level === '+10') return 250 - if (level === '+15') return 500 - if (level === '+20') return 750 - if (level === '+25') return 1250 - if (level === '+30') return 1500 + if (level === '+10') return 200 + if (level === '+15') return 400 + if (level === '+20') return 800 + if (level === '+25') return 1200 + if (level === '+30') return 2400 } if (firstAptitude || secondAptitude) { - if (level === '+5') return 250 - if (level === '+10') return 500 - if (level === '+15') return 750 - if (level === '+20') return 1000 - if (level === '+25') return 1500 - if (level === '+30') return 2500 + if (level === '+5') return 200 + if (level === '+10') return 400 + if (level === '+15') return 800 + if (level === '+20') return 1200 + if (level === '+25') return 2400 + if (level === '+30') return 3600 } if (!firstAptitude && !secondAptitude) { - if (level === '+5') return 500 - if (level === '+10') return 750 - if (level === '+15') return 1000 - if (level === '+20') return 1500 - if (level === '+25') return 2500 - if (level === '+30') return 3500 + if (level === '+5') return 400 + if (level === '+10') return 800 + if (level === '+15') return 1200 + if (level === '+20') return 2400 + if (level === '+25') return 3600 + if (level === '+30') return 4800 } } if (skill) { @@ -5086,19 +5088,19 @@ NOTE: replace worker by javascript for IDE functionality if (level === 'Known') return 100 if (level === '+10') return 200 if (level === '+20') return 300 - if (level === '+30') return 400 + if (level === '+30') return 600 } if (firstAptitude || secondAptitude) { if (level === 'Known') return 200 if (level === '+10') return 400 if (level === '+20') return 600 - if (level === '+30') return 800 + if (level === '+30') return 1200 } if (!firstAptitude && !secondAptitude) { if (level === 'Known') return 300 if (level === '+10') return 600 if (level === '+20') return 900 - if (level === '+30') return 1200 + if (level === '+30') return 1800 } } if (t1Talent) { @@ -5107,24 +5109,32 @@ NOTE: replace worker by javascript for IDE functionality if (firstAptitude && secondAptitude) return 200 if (firstAptitude || secondAptitude) return 300 - if (!firstAptitude && !secondAptitude) return 600 + if (!firstAptitude && !secondAptitude) return 500 } if (t2Talent) { var firstAptitude = aptitudes.includes(t2Talent.aptitudes[0].toLowerCase()) var secondAptitude = aptitudes.includes(t2Talent.aptitudes[1].toLowerCase()) if (firstAptitude && secondAptitude) return 300 - if (firstAptitude || secondAptitude) return 450 - if (!firstAptitude && !secondAptitude) return 900 + if (firstAptitude || secondAptitude) return 500 + if (!firstAptitude && !secondAptitude) return 800 } if (t3Talent) { var firstAptitude = aptitudes.includes(t3Talent.aptitudes[0].toLowerCase()) var secondAptitude = aptitudes.includes(t3Talent.aptitudes[1].toLowerCase()) - if (firstAptitude && secondAptitude) return 400 - if (firstAptitude || secondAptitude) return 600 + if (firstAptitude && secondAptitude) return 500 + if (firstAptitude || secondAptitude) return 800 if (!firstAptitude && !secondAptitude) return 1200 } + if (t4Talent) { + var firstAptitude = aptitudes.includes(t3Talent.aptitudes[0].toLowerCase()) + var secondAptitude = aptitudes.includes(t3Talent.aptitudes[1].toLowerCase()) + + if (firstAptitude && secondAptitude) return 800 + if (firstAptitude || secondAptitude) return 1200 + if (!firstAptitude && !secondAptitude) return 1700 + } } var costL = xpCalc(values['repeating_advancements_advancement_nameL_r']) @@ -5138,6 +5148,7 @@ NOTE: replace worker by javascript for IDE functionality setAttrs(attr,true) }) }) + /* */ on('change:xp_total change:advancement_costL change:advancement_costR change:repeating_advancements remove:repeating_advancements', () => { // get section IDs because of operation both inside and outside of fieldset getSectionIDs(`repeating_advancements`, idArray => {