-
Spell 3
-
+
-
diff --git a/styles.css b/styles.css
index 0999cd2..d41fef0 100644
--- a/styles.css
+++ b/styles.css
@@ -46,6 +46,8 @@
}
.spell-info {
+ color: #aaa;
+ background: #110110;
border: 2px solid black;
border-radius: 3px;
width: 100%;
@@ -75,11 +77,19 @@
margin-bottom: 16px;
}
-.itemp {
+.itemp, .damagep {
margin: 2px 2%;
padding: 0;
}
+.damageSubtitle {
+ text-align: center;
+ margin: 12px 2% 4px;
+ /*margin-bottom: 16px;*/
+ /*margin-top: 16px;*/
+}
+
+
.positive {
color: #5f5;
/*text-shadow: 2px 2px 0 #153f15;*/
@@ -134,6 +144,9 @@
color: #fa0;
/*text-shadow: 2px 2px 0 #2a2a00;*/
}
+.Neutral:before {
+ content: "\2724" ' ';
+}
.Health {
color: #a00;
diff --git a/test.js b/test.js
index 946f73b..22a5c56 100644
--- a/test.js
+++ b/test.js
@@ -22,7 +22,9 @@ let accessoryTypes = [ "ring", "bracelet", "necklace" ];
let weaponTypes = [ "wand", "spear", "bow", "dagger", "relik" ];
// THIS IS SUPER DANGEROUS, WE SHOULD NOT BE KEEPING THIS IN SO MANY PLACES
let item_fields = [ "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", "defReq", "agiReq", "hprPct", "mr", "sdPct", "mdPct", "ls", "ms", "xpb", "lb", "ref", "str", "dex", "int", "agi", "def", "thorns", "exploding", "spd", "atkTier", "poison", "hpBonus", "spRegen", "eSteal", "hprRaw", "sdRaw", "mdRaw", "fDamPct", "wDamPct", "aDamPct", "tDamPct", "eDamPct", "fDefPct", "wDefPct", "aDefPct", "tDefPct", "eDefPct", "fixID", "category", "spPct1", "spRaw1", "spPct2", "spRaw2", "spPct3", "spRaw3", "spPct4", "spRaw4", "rainbowRaw", "sprint", "sprintReg", "jh", "lq", "gXp", "gSpd", "id" ];
-let skpReqs = ["strReq", "dexReq", "intReq", "defReq", "agiReq"];
+
+let skp_order = ["str","dex","int","def","agi"];
+let skpReqs = skp_order.map(x => x + "Req");
let equipment_fields = [
"helmet",
@@ -218,7 +220,9 @@ function populateFromURL() {
let powdering = ["", "", "", "", ""];
let info = url_tag.split("_");
let version = info[0];
- if (version === "0" || version === "1") {
+ let save_skp = false;
+ let skillpoints = [0, 0, 0, 0, 0];
+ if (version === "0" || version === "1" || version === "2") {
let equipments = info[1];
for (let i = 0; i < 9; ++i ) {
equipment[i] = idMap.get(Base64.toInt(equipments.slice(i*3,i*3+3)));
@@ -246,6 +250,34 @@ function populateFromURL() {
powdering[i] = powders;
}
}
+ if (version === "2") {
+ save_skp = true;
+ let skillpoint_info = info[1].slice(27, 37);
+ for (let i = 0; i < 5; ++i ) {
+ skillpoints[i] = Base64.toInt(skillpoint_info.slice(i*2,i*2+2));
+ }
+
+ let powder_info = info[1].slice(37);
+ console.log(powder_info);
+ // TODO: Make this run in linear instead of quadratic time...
+ for (let i = 0; i < 5; ++i) {
+ let powders = "";
+ let n_blocks = Base64.toInt(powder_info.charAt(0));
+ console.log(n_blocks + " blocks");
+ powder_info = powder_info.slice(1);
+ for (let j = 0; j < n_blocks; ++j) {
+ let block = powder_info.slice(0,5);
+ console.log(block);
+ let six_powders = Base64.toInt(block);
+ for (let k = 0; k < 6 && six_powders != 0; ++k) {
+ powders += powderNames.get((six_powders & 0x1f) - 1);
+ six_powders >>>= 5;
+ }
+ powder_info = powder_info.slice(5);
+ }
+ powdering[i] = powders;
+ }
+ }
for (let i in powderInputs) {
setValue(powderInputs[i], powdering[i]);
@@ -253,27 +285,13 @@ function populateFromURL() {
for (let i in equipment) {
setValue(equipmentInputs[i], equipment[i]);
}
- setValue("str-skp", "0");
- setValue("dex-skp", "0");
- setValue("int-skp", "0");
- setValue("def-skp", "0");
- setValue("agi-skp", "0");
- calculateBuild();
+ calculateBuild(save_skp, skillpoints);
}
}
function encodeBuild() {
if (player_build) {
-// let build_string = "0_" + Base64.fromIntN(player_build.helmet.id, 3) +
-// Base64.fromIntN(player_build.chestplate.id, 3) +
-// Base64.fromIntN(player_build.leggings.id, 3) +
-// Base64.fromIntN(player_build.boots.id, 3) +
-// Base64.fromIntN(player_build.ring1.id, 3) +
-// Base64.fromIntN(player_build.ring2.id, 3) +
-// Base64.fromIntN(player_build.bracelet.id, 3) +
-// Base64.fromIntN(player_build.necklace.id, 3) +
-// Base64.fromIntN(player_build.weapon.id, 3);
- let build_string = "1_" + Base64.fromIntN(player_build.helmet.get("id"), 3) +
+ let build_string = "2_" + Base64.fromIntN(player_build.helmet.get("id"), 3) +
Base64.fromIntN(player_build.chestplate.get("id"), 3) +
Base64.fromIntN(player_build.leggings.get("id"), 3) +
Base64.fromIntN(player_build.boots.get("id"), 3) +
@@ -283,6 +301,10 @@ function encodeBuild() {
Base64.fromIntN(player_build.necklace.get("id"), 3) +
Base64.fromIntN(player_build.weapon.get("id"), 3);
+ for (const skp of skp_order) {
+ build_string += Base64.fromIntN(getValue(skp + "-skp"), 2); // Maximum skillpoints: 4096
+ }
+
for (const _powderset of player_build.powders) {
let n_bits = Math.ceil(_powderset.length / 6);
build_string += Base64.fromIntN(n_bits, 1); // Hard cap of 378 powders.
@@ -304,7 +326,8 @@ function encodeBuild() {
return "";
}
-function calculateBuild(){
+function calculateBuild(save_skp, skp){
+ save_skp = (typeof save_skp !== 'undefined') ? save_skp : false;
/* TODO: implement level changing
Make this entire function prettier
*/
@@ -336,14 +359,45 @@ function calculateBuild(){
equip_order_text += item.get("displayName") + "
";
}
setHTML("build-order", equip_order_text);
+ if (save_skp) {
+ // TODO: reduce duplicated code, @updateStats
+ let skillpoints = player_build.total_skillpoints;
+ let delta_total = 0;
+ for (let i in skp_order) {
+ let manual_assigned = skp[i];
+ let delta = manual_assigned - skillpoints[i];
+ skillpoints[i] = manual_assigned;
+ player_build.base_skillpoints[i] += delta;
+ delta_total += delta;
+ }
+ player_build.assigned_skillpoints += delta_total;
+ }
+ calculateBuildStats();
+
+}
+
+function updateStats() {
+ let skillpoints = player_build.total_skillpoints;
+ let delta_total = 0;
+ for (let i in skp_order) {
+ let manual_assigned = getValue(skp_order[i] + "-skp");
+ let delta = manual_assigned - skillpoints[i];
+ skillpoints[i] = manual_assigned;
+ player_build.base_skillpoints[i] += delta;
+ delta_total += delta;
+ }
+ player_build.assigned_skillpoints += delta_total;
+ calculateBuildStats();
+}
+
+function calculateBuildStats() {
+
const assigned = player_build.base_skillpoints;
const skillpoints = player_build.total_skillpoints;
-
- let skp_order = ["str","dex","int","def","agi"];
let skp_effects = ["% more damage dealt.","% chance to crit.","% spell cost reduction.","% less damage taken.","% chance to dodge."];
for (let i in skp_order){ //big bren
- setText(skp_order[i] + "-skp-assign", "Before Boosts: " + assigned[i]);
+ setText(skp_order[i] + "-skp-assign", "Base assigned: " + assigned[i]);
setValue(skp_order[i] + "-skp", skillpoints[i]);
if(assigned[i] <= 100){
setText(skp_order[i] + "-skp-base", "Original Value: " + skillpoints[i]);
@@ -352,6 +406,7 @@ function calculateBuild(){
}
setText(skp_order[i] + "-skp-pct", (skillPointsToPercentage(skillpoints[i])*100).toFixed(1).concat(skp_effects[i]));
}
+
if(player_build.assigned_skillpoints > levelToSkillPoints(player_build.level)){
setHTML("summary-box", "Summary: Assigned "+player_build.assigned_skillpoints+" skillpoints.
" + "WARNING: Too many skillpoints need to be assigned!
For level " + player_build.level + ", there are only " + levelToSkillPoints(player_build.level) + " skill points available.");
}else{
@@ -361,10 +416,7 @@ function calculateBuild(){
for (let i in player_build.items) {
displayExpandedItem(player_build.items[i], buildFields[i]);
}
- calculateBuildStats();
-}
-function calculateBuildStats() {
let meleeStats = player_build.getMeleeStats();
//nDamAdj,eDamAdj,tDamAdj,wDamAdj,fDamAdj,aDamAdj,totalDamNorm,totalDamCrit,normDPS,critDPS,avgDPS
for (let i = 0; i < 6; ++i) {
@@ -403,6 +455,13 @@ function calculateBuildStats() {
let defenseStats = "";
setHTML("build-defense-stats", "".concat(defenseStats));
+
+ let spells = spell_table[player_build.weapon.get("type")];
+ for (let i = 0; i < 4; ++i) {
+ let parent_elem = document.getElementById("spell"+i+"-info");
+ displaySpellDamage(parent_elem, player_build, spells[i], i+1);
+ }
+
location.hash = encodeBuild();
}
@@ -410,7 +469,7 @@ function resetFields(){
for (let i in powderInputs) {
setValue(powderInputs[i], "");
}
- for (let i in equipment) {
+ for (let i in equipmentInputs) {
setValue(equipmentInputs[i], "");
}
setValue("str-skp", "0");
diff --git a/test_regress.txt b/test_regress.txt
new file mode 100644
index 0000000..b797228
--- /dev/null
+++ b/test_regress.txt
@@ -0,0 +1,3 @@
+Version 0: http://localhost:8000/#0_0K30oY09X2SJ2SK2SL2SM2SN0QQ
+Version 1: http://localhost:8000/#1_0690px0CE0QR0050050K40BR0Qk00001004fI
+Version 2: http://localhost:8000/#2_2SG2SH2SI2SJ2SK0K22SM2SN05n000t210t0000000