Fix merge conflicts

This commit is contained in:
b 2021-01-06 18:10:34 -06:00
commit e731d84ada
3 changed files with 44 additions and 2 deletions

View file

@ -142,8 +142,30 @@
<label for="agi-skp">Agility:</label>
<input type="text" id="agi-skp" name="agi-skp" />
</div>
</div>
<div class = "build">
<div class = "center" id = "build-helmet" style = "grid-column:1;grid-row:1">
</div>
<div class = "center" id = "build-chestplate" style = "grid-column:2;grid-row:1">
</div>
<div class = "center" id = "build-leggings" style = "grid-column:3;grid-row:1">
</div>
<div class = "center" id = "build-boots" style = "grid-column:4;grid-row:1">
</div>
<div class = "center" id = "build-ring1" style = "grid-column:1;grid-row:2">
</div>
<div class = "center" id = "build-ring2" style = "grid-column:2;grid-row:2">
</div>
<div class = "center" id = "build-bracelet" style = "grid-column:3;grid-row:2">
</div>
<div class = "center" id = "build-necklace" style = "grid-column:4;grid-row:2">
</div>
<div class = "center" id = "build-weapon" style = "grid-column:1;grid-row:3">
</div>
<div class = "center" id = "build-cumulative-stats" style = "grid-column:2;grid-row:3">
</div>
</div>
<script type="text/javascript" src="build.js"></script>
<script type="text/javascript" src="load.js"></script>
<script type="text/javascript" src="test.js"></script>

View file

@ -22,3 +22,12 @@
.center {
text-align: center;
}
.build{
padding: 4%;
display: grid;
grid-template-columns: repeat(4, 1fr);
gap: 10px;
grid-auto-rows: minmax(60px, auto);
width: 100vw;
}

13
test.js
View file

@ -1,3 +1,5 @@
let player_build;
// Set up item lists for quick access later.
let armorTypes = [ "helmet", "chestplate", "leggings", "boots" ];
let accessoryTypes = [ "ring", "bracelet", "necklace" ];
@ -138,7 +140,7 @@ function calculateBuild(){
if(weapon===""){
weapon = "No Weapon";
}
let player_build = new Build(
player_build = new Build(
106,
itemMap.get(helmet),
itemMap.get(chestplate),
@ -151,6 +153,15 @@ function calculateBuild(){
itemMap.get(weapon),
);
console.log(player_build.toString());
document.getElementById("build-helmet").innerHTML = player_build.helmet.name;
document.getElementById("build-chestplate").innerHTML = player_build.chestplate.name;
document.getElementById("build-leggings").innerHTML = player_build.helmet.name;
document.getElementById("build-boots").innerHTML = player_build.helmet.name;
document.getElementById("build-ring1").innerHTML = player_build.ring1.name;
document.getElementById("build-ring2").innerHTML = player_build.ring2.name;
document.getElementById("build-bracelet").innerHTML = player_build.bracelet.name;
document.getElementById("build-necklace").innerHTML = player_build.necklace.name;
document.getElementById("build-weapon").innerHTML = player_build.weapon.name;
}
function resetFields(){