Merge branch 'dev' of https://github.com/hppeng-wynn/hppeng-wynn.github.io into dev

builder.js

@@ -3,11 +3,18 @@ const url_tag = location.hash.slice(1);
 console.log(url_base);
 console.log(url_tag);
 
-const BUILD_VERSION = "6.9.7";
+const BUILD_VERSION = "6.9.8";
 
 function setTitle() {
-    document.getElementById("header").textContent = "WynnBuilder version "+BUILD_VERSION+" (db version "+DB_VERSION+")";
+    let text;
-    document.getElementById("header").classList.add("funnynumber");
+    if (url_base.includes("hppeng-wynn")) {
+        text = "WynnBuilder UNSTABLE version "+BUILD_VERSION+" (db version "+DB_VERSION+")";
+    }
+    else {
+        text = "WynnBuilder version "+BUILD_VERSION+" (db version "+DB_VERSION+")";
+        document.getElementById("header").classList.add("funnynumber");
+    }
+    document.getElementById("header").textContent = text;
 }
 
 setTitle();
@@ -71,18 +78,6 @@ let equipment_names = [
 let equipmentInputs = equipment_fields.map(x => x + "-choice");
 let buildFields = equipment_fields.map(x => "build-"+x);
 
-let powderIDs = new Map();
-let powderNames = new Map();
-let _powderID = 0;
-for (const x of skp_elements) {
-    for (let i = 1; i <= 6; ++i) {
-        // Support both upper and lowercase, I guess.
-        powderIDs.set(x.toUpperCase()+i, _powderID);
-        powderIDs.set(x+i, _powderID);
-        powderNames.set(_powderID, x+i);
-        _powderID++;
-    }
-}
 let powderInputs = [
     "helmet-powder",
     "chestplate-powder",
@@ -90,45 +85,6 @@ let powderInputs = [
     "boots-powder",
     "weapon-powder",
 ];
-// Ordering: [dmgMin, dmgMax, convert, defPlus, defMinus (+6 mod 5)]
-class Powder {
-    constructor(min, max, convert, defPlus, defMinus) {
-        this.min = min;
-        this.max = max;
-        this.convert = convert;
-        this.defPlus = defPlus;
-        this.defMinus = defMinus;
-    }
-}
-function _p(a,b,c,d,e) { return new Powder(a,b,c,d,e); } //bruh moment
-
-let powderStats = [
-    _p(3,6,17,2,1), _p(6,9,21,4,2), _p(8,14,25,8,3), _p(11,16,31,14,5), _p(15,18,38,22,9), _p(18,22,46,30,13),
-    _p(1,8,9,3,1), _p(1,13,11,5,1), _p(2,18,14,9,2), _p(3,24,17,14,4), _p(3,32,22,20,7), _p(5,40,28,28,10),
-    _p(3,4,13,3,1), _p(4,7,15,6,1), _p(6,10,17,11,2), _p(8,12,21,18,4), _p(11,14,26,28,7), _p(13,17,32,40,10),
-    _p(2,5,14,3,1), _p(4,8,16,5,2), _p(6,10,19,9,3), _p(9,13,24,16,5), _p(12,16,30,25,9), _p(15,19,37,36,13),
-    _p(2,6,11,3,1), _p(4,9,14,6,2), _p(7,10,17,10,3), _p(9,13,22,16,5), _p(13,18,28,24,9), _p(16,18,35,34,13)
-];
-
-//Ordering: [weapon special name, weapon special effects, armor special name, armor special effects]
-class PowderSpecial{
-    constructor(wSpName, wSpEff, aSpName, aSpEff, cap){
-        this.weaponSpecialName = wSpName;
-        this.weaponSpecialEffects = wSpEff;
-        this.armorSpecialName = aSpName;
-        this.armorSpecialEffects = aSpEff;
-        this.cap = cap;
-    }
-}
-function _ps(a,b,c,d,e) { return new PowderSpecial(a,b,c,d,e); } //bruh moment
-
-let powderSpecialStats = [
-    _ps("Quake",new Map([["Radius",[5,5.5,6,6.5,7]], ["Damage",[155,220,285,350,415]] ]),"Rage",new Map([ ["Damage", [0.3,0.4,0.5,0.7,1.0]],["Description", "% " + "\u2764" + " Missing"] ]),400), //e
-    _ps("Chain Lightning",new Map([ ["Chains", [5,6,7,8,9]], ["Damage", [200,225,250,275,300]] ]),"Kill Streak",new Map([ ["Damage", [3,4.5,6,7.5,9]],["Duration", [5,5,5,5,5]],["Description", "Mob Killed"] ]),200), //t
-    _ps("Curse",new Map([ ["Duration", [7,7.5,8,8.5,9]],["Damage Boost", [90,120,150,180,210]] ]),"Concentration",new Map([ ["Damage", [1,2,3,4,5]],["Duration",[1,1,1,1,1]],["Description", "Mana Used"] ]),150), //w
-    _ps("Courage",new Map([ ["Duration", [6,6.5,7,7.5,8]],["Damage", [75,87.5,100,112.5,125]],["Damage Boost", [70,90,110,130,150]] ]),"Endurance",new Map([ ["Damage", [2,3,4,5,6]],["Duration", [8,8,8,8,8]],["Description", "Hit Taken"] ]),200), //f
-    _ps("Air Prison",new Map([ ["Duration", [3,3.5,4,4.5,5]],["Damage Boost", [400,450,500,550,600]],["Knockback", [8,12,16,20,24]] ]),"Dodge",new Map([ ["Damage",[2,3,4,5,6]],["Duration",[2,3,4,5,6]],["Description","Near Mobs"] ]),150) //a
-];
 
 let itemTypes = armorTypes.concat(accessoryTypes).concat(weaponTypes);
 let itemLists = new Map();
@@ -767,7 +723,8 @@ function calculateBuildStats() {
     //skpRow.classList.add("left");
     let td = document.createElement("p");
     //td.classList.add("left");
-    let skpSummary = document.createElement("b");
+
+    /* let skpSummary = document.createElement("b");
     skpSummary.textContent = "Assigned " + player_build.assigned_skillpoints + " skillpoints. Total: (";
     //skpSummary.classList.add("itemp");
     td.appendChild(skpSummary);
@@ -786,12 +743,12 @@ function calculateBuildStats() {
     let skpEnd = document.createElement("b");
     skpEnd.textContent = ")";
     td.appendChild(skpEnd);
-    skpRow.append(td);
+    skpRow.append(td); */
 
     let remainingSkp = document.createElement("p");
     remainingSkp.classList.add("center");
     let remainingSkpTitle = document.createElement("b");
-    remainingSkpTitle.textContent = "Remaining skillpoints: ";
+    remainingSkpTitle.textContent = "Assigned " + player_build.assigned_skillpoints + " skillpoints. Remaining skillpoints: ";
     let remainingSkpContent = document.createElement("b");
     //remainingSkpContent.textContent = "" + (levelToSkillPoints(player_build.level) - player_build.assigned_skillpoints < 0 ? "< 0" : levelToSkillPoints(player_build.level) - player_build.assigned_skillpoints);
     remainingSkpContent.textContent = "" + (levelToSkillPoints(player_build.level) - player_build.assigned_skillpoints);

clean.json

@@ -276257,11 +276257,11 @@
       "atkSpd": "SLOW",
       "lvl": 97,
       "classReq": null,
-      "strReq": 40,
+      "strReq": 35,
-      "dexReq": 40,
+      "dexReq": 35,
-      "intReq": 40,
+      "intReq": 35,
-      "agiReq": 40,
+      "agiReq": 35,
-      "defReq": 40,
+      "defReq": 35,
       "hprPct": 0,
       "mr": 0,
       "sdPct": 0,

crafter.html

@@ -178,6 +178,7 @@
         </div>
 
         <script type="text/javascript" src="utils.js"></script>
+        <script type="text/javascript" src="powders.js"></script>
         <script type="text/javascript" src="build_utils.js"></script>
         <script type="text/javascript" src="skillpoints.js"></script>
         <script type="text/javascript" src="damage_calc.js"></script>

display.js

@@ -1882,7 +1882,7 @@ function displaySpellDamage(parent_elem, overallparent_elem, build, spell, spell
                 let overallhealLabel = document.createElement("p");
                 let first = document.createElement("b");
                 let second = document.createElement("b");
-                first.textContent = part.subtitle + ":";
+                first.textContent = part.subtitle + ": ";
                 second.textContent = heal_amount;
                 overallhealLabel.appendChild(first);
                 second.classList.add("Set");

load.js

@@ -1,4 +1,4 @@
-const DB_VERSION = 24;
+const DB_VERSION = 25;
 // @See https://github.com/mdn/learning-area/blob/master/javascript/apis/client-side-storage/indexeddb/video-store/index.js
 
 let db;

narrow.css

@@ -6,6 +6,14 @@
     grid-column: 2;
     grid-row: 2;
 }
+
+.equipment{
+    padding: 0%;
+    display: grid;
+    grid-template-columns: min-content min-content auto;
+    gap: 5px;
+    grid-template-rows: min-content min-content auto;
+}
 .summary {
     padding: 2% 4% 4%;
     display: grid;
@@ -36,6 +44,12 @@
     max-height: 50px;
 }
 
+.powderinput {
+    width: 25vw;
+    height: 10vw;
+    max-height: 50px;
+}
+
 .skpInput, .idInput {
     width: 90%;
     height: 7vw;
@@ -47,7 +61,7 @@
 }
 
 .idLabel, .skpLabel, .idDesc, .skpDesc {
-    font-size: 100%;
+    font-size: 90%;
 }
 
 .title{

powders.js

@@ -0,0 +1,52 @@
+let powderIDs = new Map();
+let powderNames = new Map();
+let _powderID = 0;
+for (const x of skp_elements) {
+    for (let i = 1; i <= 6; ++i) {
+        // Support both upper and lowercase, I guess.
+        powderIDs.set(x.toUpperCase()+i, _powderID);
+        powderIDs.set(x+i, _powderID);
+        powderNames.set(_powderID, x+i);
+        _powderID++;
+    }
+}
+
+// Ordering: [dmgMin, dmgMax, convert, defPlus, defMinus (+6 mod 5)]
+class Powder {
+    constructor(min, max, convert, defPlus, defMinus) {
+        this.min = min;
+        this.max = max;
+        this.convert = convert;
+        this.defPlus = defPlus;
+        this.defMinus = defMinus;
+    }
+}
+function _p(a,b,c,d,e) { return new Powder(a,b,c,d,e); } //bruh moment
+
+let powderStats = [
+    _p(3,6,17,2,1), _p(6,9,21,4,2), _p(8,14,25,8,3), _p(11,16,31,14,5), _p(15,18,38,22,9), _p(18,22,46,30,13),
+    _p(1,8,9,3,1), _p(1,13,11,5,1), _p(2,18,14,9,2), _p(3,24,17,14,4), _p(3,32,22,20,7), _p(5,40,28,28,10),
+    _p(3,4,13,3,1), _p(4,7,15,6,1), _p(6,10,17,11,2), _p(8,12,21,18,4), _p(11,14,26,28,7), _p(13,17,32,40,10),
+    _p(2,5,14,3,1), _p(4,8,16,5,2), _p(6,10,19,9,3), _p(9,13,24,16,5), _p(12,16,30,25,9), _p(15,19,37,36,13),
+    _p(2,6,11,3,1), _p(4,9,14,6,2), _p(7,10,17,10,3), _p(9,13,22,16,5), _p(13,18,28,24,9), _p(16,18,35,34,13)
+];
+
+//Ordering: [weapon special name, weapon special effects, armor special name, armor special effects]
+class PowderSpecial{
+    constructor(wSpName, wSpEff, aSpName, aSpEff, cap){
+        this.weaponSpecialName = wSpName;
+        this.weaponSpecialEffects = wSpEff;
+        this.armorSpecialName = aSpName;
+        this.armorSpecialEffects = aSpEff;
+        this.cap = cap;
+    }
+}
+function _ps(a,b,c,d,e) { return new PowderSpecial(a,b,c,d,e); } //bruh moment
+
+let powderSpecialStats = [
+    _ps("Quake",new Map([["Radius",[5,5.5,6,6.5,7]], ["Damage",[155,220,285,350,415]] ]),"Rage",new Map([ ["Damage", [0.3,0.4,0.5,0.7,1.0]],["Description", "% " + "\u2764" + " Missing"] ]),400), //e
+    _ps("Chain Lightning",new Map([ ["Chains", [5,6,7,8,9]], ["Damage", [200,225,250,275,300]] ]),"Kill Streak",new Map([ ["Damage", [3,4.5,6,7.5,9]],["Duration", [5,5,5,5,5]],["Description", "Mob Killed"] ]),200), //t
+    _ps("Curse",new Map([ ["Duration", [7,7.5,8,8.5,9]],["Damage Boost", [90,120,150,180,210]] ]),"Concentration",new Map([ ["Damage", [1,2,3,4,5]],["Duration",[1,1,1,1,1]],["Description", "Mana Used"] ]),150), //w
+    _ps("Courage",new Map([ ["Duration", [6,6.5,7,7.5,8]],["Damage", [75,87.5,100,112.5,125]],["Damage Boost", [70,90,110,130,150]] ]),"Endurance",new Map([ ["Damage", [2,3,4,5,6]],["Duration", [8,8,8,8,8]],["Description", "Hit Taken"] ]),200), //f
+    _ps("Air Prison",new Map([ ["Duration", [3,3.5,4,4.5,5]],["Damage Boost", [400,450,500,550,600]],["Knockback", [8,12,16,20,24]] ]),"Dodge",new Map([ ["Damage",[2,3,4,5,6]],["Duration",[2,3,4,5,6]],["Description","Near Mobs"] ]),150) //a
+];

styles.css

@@ -24,14 +24,6 @@ div {
     padding: 0%;
 }
 
-.equipment{
-    padding: 0%;
-    display: grid;
-    grid-template-columns: min-content min-content min-content;
-    gap: 5px;
-    grid-template-rows: min-content min-content auto;
-}
-
 .skillpoints{
     padding: 0% 4% 2%;
     display: grid;
@@ -92,13 +84,23 @@ table.center{
     text-align: left;
 }
 
-.build-helmet, .build-chestplate, .build-leggings, .build-boots, .build-ring1, .build-ring2, .build-bracelet, .build-necklace, .build-weapon, .build-order, .build-overall, .build-melee-stats, .build-defense-stats, .spell-info, .set-info, .powder-special, .powder-special-stats, .int-info, .id-box, .box {
+.build-helmet, .build-chestplate, .build-leggings, .build-boots, .build-ring1, .build-ring2, .build-bracelet, .build-necklace, .build-weapon, .build-order, .build-overall, .build-melee-stats, .build-defense-stats, .spell-info, .set-info, .powder-special, .powder-special-stats, .int-info, .box {
     color: #aaa;
     background: #121516;
     border: 3px solid #BCBCBC;
     border-radius: 3px;
     width: 96%;
 }
+
+.id-box {
+    color: #aaa;
+    background: #121516;
+    border: 3px solid #BCBCBC;
+    border-radius: 3px;
+    width: 96%;
+    margin: 1em 0px 0px 0px;
+}
+
 .crafter, .recipe-stats, .craft-stats, .ing-stats {
     color: #aaa;
     background: #121516;
@@ -131,6 +133,12 @@ table.center{
     margin: 2px 2%;
     padding: 0;
 }
+.powderLeft {
+    margin-right: 0px;
+}
+.powderRight {
+    margin-left: 0px;
+}
 .space {
     margin-right: 5px;
 }

wide.css

@@ -4,6 +4,15 @@
 .spell-info-container {
     grid-column:4;
 }
+
+.equipment{
+    padding: 0%;
+    display: grid;
+    grid-template-columns: repeat(3, 1fr);
+    width: 50vw;
+    gap: 5px;
+    grid-template-rows: min-content min-content auto;
+}
 .sticky-box {
     position: sticky;
     top: 0;
@@ -51,9 +60,9 @@
 }
 
 .skpInput, .idInput {
-    width: 90%;
+    width: 95%;
     height: 7vw;
-    max-height: 30px;
+    max-height: 20px;
 }
 
 .wide-space {