Skip to content

Commit

Permalink
Merge branch 'edgeFixes'
Browse files Browse the repository at this point in the history
  • Loading branch information
MichaelEbert committed Oct 25, 2021
2 parents 79a3a14 + 68255d6 commit 33209ff
Show file tree
Hide file tree
Showing 16 changed files with 482 additions and 424 deletions.
39 changes: 25 additions & 14 deletions casual.html
Original file line number Diff line number Diff line change
Expand Up @@ -38,24 +38,35 @@
<div class="topbarSection">
<a href="./speedrun-3.html">Speedrun Guide (v3)</a>
<div class="topbarSublist">
<a href="./speedrun-3.html#guide_pregame">Pregame</a>
<a href="./speedrun-3.html#guide_tutorial">Tutorial</a>
<a href="./speedrun-3.html#guide_ICMarketDistrict">Imperial City Market District</a>
<a href="./speedrun-3.html#guide_MagesGuildPt1">Mages Guild Pt1</a>
<a href="./speedrun-3.html#guide_GoldFarming">Gold Farming</a>
<a href="./speedrun-3.html#guide_InvestingCircuit">Investing Circuit</a>
<a href="./speedrun-3.html#guide_MagesGuildPt2">Mages Guild Pt2</a>
<a href="./speedrun-3.html#guide_MainQuestPt1">Main Quest Pt1</a>
<a href="./speedrun-3.html#guide_MapExploration">Map Exploration</a>
<a href="./speedrun-3.html#guide_TheNirnroute">The Nirn-Route</a>
<a href="./speedrun-3.html#guide_MainQuestPt2">Main Quest Pt2</a>
<a href="./speedrun-3.html#guide_FightersGuild">Fighters Guild</a>
</div>
<a href="./speedrun-3.html#guide_Pregame">Pregame</a>
<a href="./speedrun-3.html#guide_Tutorial">Tutorial</a>
<a href="./speedrun-3.html#guide_ImperialCityMarketDistrict">Imperial City Market District</a>
<a href="./speedrun-3.html#guide_MagesGuildPt1">Mages Guild Pt1</a>
<a href="./speedrun-3.html#guide_GoldFarming">Gold Farming/Arcane University</a>
<a href="./speedrun-3.html#guide_InvestingCircuit">Investing Circuit</a>
<a href="./speedrun-3.html#guide_MagesGuildPt2">Mages Guild Pt2</a>
<a href="./speedrun-3.html#guide_MainQuestPt1">Main Quest Pt1</a>
<a href="./speedrun-3.html#guide_MapExploration">Map Exploration</a>
<a href="./speedrun-3.html#guide_TheNirnroute">The Nirnroute</a>
<a href="./speedrun-3.html#guide_MainQuestPt2">Main Quest Pt2</a>
<a href="./speedrun-3.html#guide_FightersGuild">Fighters Guild</a>
<a href="./speedrun-3.html#guide_TheArena">The Arena</a>
<a href="./speedrun-3.html#guide_SideQuests">Side Quests</a>
<a href="./speedrun-3.html#guide_DarkBrotherhood">Dark Brotherhood</a>
<a href="./speedrun-3.html#guide_PowerLeveling">Power Leveling</a>
<a href="./speedrun-3.html#guide_ThievesGuild">Thieves Guild</a>
<a href="./speedrun-3.html#guide_DaedricShrines">Daedric Shrines</a>
<a href="./speedrun-3.html#guide_HeavenStoneGreaterPowers">Heaven Stone Greater Powers</a>
<a href="./speedrun-3.html#guide_RandomSkillBooks">Random Skill Books</a>
<a href="./speedrun-3.html#guide_TheGreatSkillGrind">The Great Skill Grind</a>
<a href="./speedrun-3.html#guide_AnUnexpectedVoyage">An Unexpected Voyage</a>
<a href="./speedrun-3.html#guide_ImperialDragonArmor">Imperial Dragon Armor</a>
</div>
</div>

<a href="./settings.html" class="topbarSection"> Settings</a>

<div class="topbarSection"><span id="totalProgressPercent">0</span>%</div>
<div class="topbarSection"><span class="totalProgressPercent">0</span>%</div>
</div>
<br/>
<div class="contentContainer" id="contentContainer">
Expand Down
3 changes: 3 additions & 0 deletions data/dataversions.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
1: flat map. use sequential IDs as primary keys.
2: tree. use sequential IDs as primary keys. has weight. has hive name in root node.
3: tree. Use formID as primary keys.
Binary file added data/minipages/book/book0x0002453F_ingame.webp
Binary file not shown.
4 changes: 4 additions & 0 deletions data/minipages/minipage.css
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,8 @@

p{
margin: 0.2em;
}

img{
max-width:100%;
}
52 changes: 28 additions & 24 deletions data/skill.json
Original file line number Diff line number Diff line change
@@ -1,25 +1,29 @@
{"version":1,"elements":[
{"id":0,"name":"Armorer","specialization":"Combat"}
,{"id":1,"name":"Athletics","specialization":"Combat"}
,{"id":2,"name":"Blade","specialization":"Combat"}
,{"id":3,"name":"Block","specialization":"Combat"}
,{"id":4,"name":"Blunt","specialization":"Combat"}
,{"id":5,"name":"Hand to Hand","specialization":"Combat"}
,{"id":6,"name":"Heavy Armor","specialization":"Combat"}

,{"id":7,"name":"Alchemy","specialization":"Magic"}
,{"id":8,"name":"Alteration","specialization":"Magic"}
,{"id":9,"name":"Conjuration","specialization":"Magic"}
,{"id":10,"name":"Destruction","specialization":"Magic"}
,{"id":11,"name":"Illusion","specialization":"Magic"}
,{"id":12,"name":"Mysticism","specialization":"Magic"}
,{"id":13,"name":"Restoration","specialization":"Magic"}

,{"id":14,"name":"Acrobatics","specialization":"Stealth"}
,{"id":15,"name":"Light Armor","specialization":"Stealth"}
,{"id":16,"name":"Marksman","specialization":"Stealth"}
,{"id":17,"name":"Mercantile","specialization":"Stealth"}
,{"id":18,"name":"Security","specialization":"Stealth"}
,{"id":19,"name":"Sneak","specialization":"Stealth"}
,{"id":20,"name":"Speechcraft","specialization":"Stealth"}
{"version":2,"name":"skill","weight":15,"elements":[
{"name":"Combat","elements":[
{"id":0,"name":"Armorer"}
,{"id":1,"name":"Athletics"}
,{"id":2,"name":"Blade"}
,{"id":3,"name":"Block"}
,{"id":4,"name":"Blunt"}
,{"id":5,"name":"Hand to Hand"}
,{"id":6,"name":"Heavy Armor"}
]}
,{"name":"Magic","elements":[
{"id":7,"name":"Alchemy"}
,{"id":8,"name":"Alteration"}
,{"id":9,"name":"Conjuration"}
,{"id":10,"name":"Destruction"}
,{"id":11,"name":"Illusion"}
,{"id":12,"name":"Mysticism"}
,{"id":13,"name":"Restoration"}
]}
,{"name":"Stealth","elements":[
{"id":14,"name":"Acrobatics"}
,{"id":15,"name":"Light Armor"}
,{"id":16,"name":"Marksman"}
,{"id":17,"name":"Mercantile"}
,{"id":18,"name":"Security"}
,{"id":19,"name":"Sneak"}
,{"id":20,"name":"Speechcraft"}
]}
]}
37 changes: 24 additions & 13 deletions glitches.html
Original file line number Diff line number Diff line change
Expand Up @@ -37,19 +37,30 @@
<div class="topbarSection">
<a href="./speedrun-3.html">Speedrun Guide (v3)</a>
<div class="topbarSublist">
<a href="./speedrun-3.html#guide_pregame">Pregame</a>
<a href="./speedrun-3.html#guide_tutorial">Tutorial</a>
<a href="./speedrun-3.html#guide_ICMarketDistrict">Imperial City Market District</a>
<a href="./speedrun-3.html#guide_MagesGuildPt1">Mages Guild Pt1</a>
<a href="./speedrun-3.html#guide_GoldFarming">Gold Farming</a>
<a href="./speedrun-3.html#guide_InvestingCircuit">Investing Circuit</a>
<a href="./speedrun-3.html#guide_MagesGuildPt2">Mages Guild Pt2</a>
<a href="./speedrun-3.html#guide_MainQuestPt1">Main Quest Pt1</a>
<a href="./speedrun-3.html#guide_MapExploration">Map Exploration</a>
<a href="./speedrun-3.html#guide_TheNirnroute">The Nirn-Route</a>
<a href="./speedrun-3.html#guide_MainQuestPt2">Main Quest Pt2</a>
<a href="./speedrun-3.html#guide_FightersGuild">Fighters Guild</a>
</div>
<a href="./speedrun-3.html#guide_Pregame">Pregame</a>
<a href="./speedrun-3.html#guide_Tutorial">Tutorial</a>
<a href="./speedrun-3.html#guide_ImperialCityMarketDistrict">Imperial City Market District</a>
<a href="./speedrun-3.html#guide_MagesGuildPt1">Mages Guild Pt1</a>
<a href="./speedrun-3.html#guide_GoldFarming">Gold Farming/Arcane University</a>
<a href="./speedrun-3.html#guide_InvestingCircuit">Investing Circuit</a>
<a href="./speedrun-3.html#guide_MagesGuildPt2">Mages Guild Pt2</a>
<a href="./speedrun-3.html#guide_MainQuestPt1">Main Quest Pt1</a>
<a href="./speedrun-3.html#guide_MapExploration">Map Exploration</a>
<a href="./speedrun-3.html#guide_TheNirnroute">The Nirnroute</a>
<a href="./speedrun-3.html#guide_MainQuestPt2">Main Quest Pt2</a>
<a href="./speedrun-3.html#guide_FightersGuild">Fighters Guild</a>
<a href="./speedrun-3.html#guide_TheArena">The Arena</a>
<a href="./speedrun-3.html#guide_SideQuests">Side Quests</a>
<a href="./speedrun-3.html#guide_DarkBrotherhood">Dark Brotherhood</a>
<a href="./speedrun-3.html#guide_PowerLeveling">Power Leveling</a>
<a href="./speedrun-3.html#guide_ThievesGuild">Thieves Guild</a>
<a href="./speedrun-3.html#guide_DaedricShrines">Daedric Shrines</a>
<a href="./speedrun-3.html#guide_HeavenStoneGreaterPowers">Heaven Stone Greater Powers</a>
<a href="./speedrun-3.html#guide_RandomSkillBooks">Random Skill Books</a>
<a href="./speedrun-3.html#guide_TheGreatSkillGrind">The Great Skill Grind</a>
<a href="./speedrun-3.html#guide_AnUnexpectedVoyage">An Unexpected Voyage</a>
<a href="./speedrun-3.html#guide_ImperialDragonArmor">Imperial Dragon Armor</a>
</div>
</div>

<a href="./settings.html" class="topbarSection"> Settings</a>
Expand Down
41 changes: 26 additions & 15 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -39,27 +39,38 @@
<div class="topbarSection">
<a href="./speedrun-3.html">Speedrun Guide (v3)</a>
<div class="topbarSublist">
<a href="./speedrun-3.html#guide_pregame">Pregame</a>
<a href="./speedrun-3.html#guide_tutorial">Tutorial</a>
<a href="./speedrun-3.html#guide_ICMarketDistrict">Imperial City Market District</a>
<a href="./speedrun-3.html#guide_MagesGuildPt1">Mages Guild Pt1</a>
<a href="./speedrun-3.html#guide_GoldFarming">Gold Farming</a>
<a href="./speedrun-3.html#guide_InvestingCircuit">Investing Circuit</a>
<a href="./speedrun-3.html#guide_MagesGuildPt2">Mages Guild Pt2</a>
<a href="./speedrun-3.html#guide_MainQuestPt1">Main Quest Pt1</a>
<a href="./speedrun-3.html#guide_MapExploration">Map Exploration</a>
<a href="./speedrun-3.html#guide_TheNirnroute">The Nirn-Route</a>
<a href="./speedrun-3.html#guide_MainQuestPt2">Main Quest Pt2</a>
<a href="./speedrun-3.html#guide_FightersGuild">Fighters Guild</a>
</div>
<a href="./speedrun-3.html#guide_Pregame">Pregame</a>
<a href="./speedrun-3.html#guide_Tutorial">Tutorial</a>
<a href="./speedrun-3.html#guide_ImperialCityMarketDistrict">Imperial City Market District</a>
<a href="./speedrun-3.html#guide_MagesGuildPt1">Mages Guild Pt1</a>
<a href="./speedrun-3.html#guide_GoldFarming">Gold Farming/Arcane University</a>
<a href="./speedrun-3.html#guide_InvestingCircuit">Investing Circuit</a>
<a href="./speedrun-3.html#guide_MagesGuildPt2">Mages Guild Pt2</a>
<a href="./speedrun-3.html#guide_MainQuestPt1">Main Quest Pt1</a>
<a href="./speedrun-3.html#guide_MapExploration">Map Exploration</a>
<a href="./speedrun-3.html#guide_TheNirnroute">The Nirnroute</a>
<a href="./speedrun-3.html#guide_MainQuestPt2">Main Quest Pt2</a>
<a href="./speedrun-3.html#guide_FightersGuild">Fighters Guild</a>
<a href="./speedrun-3.html#guide_TheArena">The Arena</a>
<a href="./speedrun-3.html#guide_SideQuests">Side Quests</a>
<a href="./speedrun-3.html#guide_DarkBrotherhood">Dark Brotherhood</a>
<a href="./speedrun-3.html#guide_PowerLeveling">Power Leveling</a>
<a href="./speedrun-3.html#guide_ThievesGuild">Thieves Guild</a>
<a href="./speedrun-3.html#guide_DaedricShrines">Daedric Shrines</a>
<a href="./speedrun-3.html#guide_HeavenStoneGreaterPowers">Heaven Stone Greater Powers</a>
<a href="./speedrun-3.html#guide_RandomSkillBooks">Random Skill Books</a>
<a href="./speedrun-3.html#guide_TheGreatSkillGrind">The Great Skill Grind</a>
<a href="./speedrun-3.html#guide_AnUnexpectedVoyage">An Unexpected Voyage</a>
<a href="./speedrun-3.html#guide_ImperialDragonArmor">Imperial Dragon Armor</a>
</div>
</div>

<a href="./settings.html" class="topbarSection"> Settings</a>

<div class="topbarSection"><span id="totalProgressPercent">0</span>%</div>
<div class="topbarSection"><span class="totalProgressPercent">0</span>%</div>
</div>
<br/><br/>
<div id="progress" class="progress">Total Progress: <span id="totalProgressPercent">0</span>%</div>
<div id="progress" class="progress">Total Progress: <span class="totalProgressPercent">0</span>%</div>
<div id="overview" class="section">
<div class="h2">Checklist Overview</div>

Expand Down
18 changes: 14 additions & 4 deletions injection.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@ function init(){
replaceElements();
linkNPCs();
initIframe();
updateTopbarPercent();
window.addEventListener("input" ,updateTopbarPercent);
});
}

Expand Down Expand Up @@ -256,9 +254,12 @@ function createLinkElement(cell, classname, forceMinipage=false){
return linky;
}

/**
* Updates UI elements from save data.
* Call this when save data changes.
* since these pages may contain multiple references to teh same object, we need to do this from the element side, not from the data side.
*/
function updateUIFromSaveData2(){
//since these pages may contain multiple references to teh same object, we need to
//do this from the element side, not from the data side.
for(const linkedElement of linkedElements){
var checkbox = Array.from(linkedElement.htmlElement.children).find(x=>x.tagName=="INPUT");
if(checkbox.type=="checkbox"){
Expand All @@ -274,6 +275,15 @@ function updateUIFromSaveData2(){
checkbox.value = savedata[linkedElement.classname][linkedElement.id];
}
}
let percentCompleteSoFar = recalculateProgress();
//round progress to 2 decimal places
var progress = Math.round((percentCompleteSoFar * 100)*100)/100;
Array.of(...document.getElementsByClassName("totalProgressPercent")).forEach(element => {
element.innerHTML = progress.toString();
if(element.parentElement.className == "topbarSection"){
element.parentElement.style = `background: linear-gradient(to right, green ${progress.toString()}%, red ${progress.toString()}%);`;
}
});
}

function setParentChecked(item){
Expand Down
Loading

0 comments on commit 33209ff

Please sign in to comment.