Merge branch 'master' into experimental

css/sq2bs.css

@@ -198,6 +198,60 @@ input.equipment-input:not(.is-invalid) {
     max-width: 95%;
 }
 
+@media screen and (orientation: landscape) and (max-width: 1199px) {
+    :root {
+        --scaled-fontsize: 1rem;
+    }
+    .scaled-font {
+        font-size: 1rem;
+    }
+
+    .box-title {
+        font-size: 1rem;
+    }
+
+    .item-title {
+        font-size: 1.2rem;
+    }
+
+    .big-title {
+        font-size: 1.5rem;
+    }
+
+    .skp-tooltip {
+        font-size: 1rem;
+    }
+
+    .spellcost-tooltip b {
+        font-size: .625rem !important;
+    }
+
+    .scaled-item-icon {
+        width: 3.2rem;
+    }
+
+    .scaled-item-icon img {
+        width: 2.8rem;
+    }
+
+    .scaled-bckgrd {
+        width: 4rem;
+        height: 4rem;
+    }
+
+    .scaled-bckgrd img {
+        width: 2.8rem;
+    }
+
+    .warning {
+        font-size: .7rem;
+    }
+
+    .spell-display b {
+        font-size: 1rem;
+    }
+}
+
 @media screen and (min-width: 1200px) and (max-width: 1400px) {
     :root {
         --scaled-fontsize: 1rem;

js/atree_constants.js

@@ -5242,7 +5242,9 @@ const atrees = {
                 "Teleport"
             ],
             "dependencies": [],
-            "blockers": [],
+            "blockers": [
+                "Wisdom"
+            ],
             "cost": 1,
             "display": {
                 "row": 6,
@@ -5594,7 +5596,11 @@ const atrees = {
                 "Burning Sigil"
             ],
             "dependencies": [],
-            "blockers": [],
+            "blockers": [
+                "Sunshower",
+                "Larger Heal",
+                "Orphion's Pulse"
+            ],
             "cost": 2,
             "display": {
                 "row": 15,
@@ -7661,6 +7667,17 @@ const atrees = {
                             ]
                         }
                     ]
+                },
+                {
+                    "type": "raw_stat",
+                    "toggle": "Activate Backstab",
+                    "bonuses": [
+                        {
+                            "type": "stat",
+                            "name": "damMult.Backstab:3.Backstab Damage",
+                            "value": 100
+                        }
+                    ]
                 }
             ]
         },

js/build.js

@@ -41,7 +41,13 @@ class Build{
 
         // calc skillpoints requires statmaps only
         let result = calculate_skillpoints(this.equipment.map((x) => x.statMap), this.weapon.statMap);
-        this.equip_order = result[0];
+        this.equip_order = result[0].slice();
+        for (let i = 0; i < this.equip_order.length; i++) {
+            if (this.equip_order[i].get("category") === "tome" || this.equip_order[i].get("fixID") === true) {
+                this.equip_order.splice(i, 1);
+		i--;
+            }
+        }
         // How many skillpoints the player had to assign (5 number)
         this.base_skillpoints = result[1];
         // How many skillpoints the build ended up with (5 number)

js/builder.js

@@ -63,6 +63,9 @@ function resetFields(){
     for (const i of equipment_inputs) {
         setValue(i, "");
     }
+    for (const i of tomeInputs) {
+        setValue(i, "");
+    }
     setValue("str-skp", "0");
     setValue("dex-skp", "0");
     setValue("int-skp", "0");