Merge branch 'master' into experimental

This commit is contained in:
hppeng 2022-08-01 20:41:12 -07:00
commit 78dc7498dd
5 changed files with 84 additions and 4 deletions

View file

@ -198,6 +198,60 @@ input.equipment-input:not(.is-invalid) {
max-width: 95%; 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) { @media screen and (min-width: 1200px) and (max-width: 1400px) {
:root { :root {
--scaled-fontsize: 1rem; --scaled-fontsize: 1rem;

View file

@ -5242,7 +5242,9 @@ const atrees = {
"Teleport" "Teleport"
], ],
"dependencies": [], "dependencies": [],
"blockers": [], "blockers": [
"Wisdom"
],
"cost": 1, "cost": 1,
"display": { "display": {
"row": 6, "row": 6,
@ -5594,7 +5596,11 @@ const atrees = {
"Burning Sigil" "Burning Sigil"
], ],
"dependencies": [], "dependencies": [],
"blockers": [], "blockers": [
"Sunshower",
"Larger Heal",
"Orphion's Pulse"
],
"cost": 2, "cost": 2,
"display": { "display": {
"row": 15, "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
}
]
} }
] ]
}, },

File diff suppressed because one or more lines are too long

View file

@ -41,7 +41,13 @@ class Build{
// calc skillpoints requires statmaps only // calc skillpoints requires statmaps only
let result = calculate_skillpoints(this.equipment.map((x) => x.statMap), this.weapon.statMap); 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) // How many skillpoints the player had to assign (5 number)
this.base_skillpoints = result[1]; this.base_skillpoints = result[1];
// How many skillpoints the build ended up with (5 number) // How many skillpoints the build ended up with (5 number)

View file

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