copy bugfix for havok moved; add support for tracking nirnroots, aren…

…a fights, fame; clean up gates a bit
valarnin · Sep 11, 2021 · e267bc9 · e267bc9
1 parent ae26ea8
commit e267bc9
Show file tree

Hide file tree

Showing 3 changed files with 667 additions and 112 deletions.
diff --git a/save/record_instancereference.ts b/save/record_instancereference.ts
@@ -121,7 +121,7 @@ export class RecordInstanceReference {
                 offset += 4;
             }
             if (offset - startOffset > record.dataSize) {/* console.log('Invalid object', record, this); */ return;}
-            if (record.flags & 0x8) {
+            if (record.flags & 0x8 && !(record.flags & 0x2 || record.flags & 0x4)) {
                 this.havokMoved_cell = bufToInt(buf.slice(offset, offset + 4));
                 offset += 4;
                 this.havokMoved_x = bufToFloat(buf.slice(offset, offset + 4));

diff --git a/test.html b/test.html
@@ -229,36 +229,79 @@
         <td colspan=6 class="total-completed"></td>
       </tfoot>
     </table>
-    <table id='fame-table' border=1>
+    <table id='arena-table' border=1>
       <thead>
         <tr>
-          <th colspan=3 style="text-align:center">Fame</th>
+          <th colspan=4 style="text-align:center">Arena</th>
         </tr>
         <tr>
           <th></th>
-          <th></th>
-          <th></th>
+          <th>Form ID</th>
+          <th>Name</th>
+          <th>Fame</th>
         </tr>
       </thead>
       <tbody></tbody>
       <tfoot>
         <td colspan=3 class="total-completed"></td>
+        <td class="total-fame"></td>
       </tfoot>
     </table>
-    <table id='nirnroot-table' border=1>
+    <table id='fame-table' border=1>
       <thead>
         <tr>
-          <th colspan=3 style="text-align:center">Nirnroots</th>
+          <th colspan=4 style="text-align:center">Fame</th>
         </tr>
         <tr>
           <th></th>
+          <th>Source</th>
+          <th>Current</th>
+          <th>Max</th>
+        </tr>
+      </thead>
+      <tbody>
+        <tr class="quests">
+          <td class="status"></td>
+          <td class="source">Quests</td>
+          <td class="current"></td>
+          <td class="max"></td>
+        </tr>
+        <tr class="gates">
+          <td class="status"></td>
+          <td class="source">Gates</td>
+          <td class="current"></td>
+          <td class="max"></td>
+        </tr>
+        <tr class="arena">
+          <td class="status"></td>
+          <td class="source">Arena</td>
+          <td class="current"></td>
+          <td class="max"></td>
+        </tr>
+        <tr class="total">
+          <td class="status"></td>
+          <td class="source">Total</td>
+          <td class="current"></td>
+          <td class="max"></td>
+        </tr>
+      </tbody>
+    </table>
+    <table id='nirnroot-table' border=1>
+      <thead>
+        <tr>
+          <th colspan=5 style="text-align:center">Nirnroots</th>
+        </tr>
+        <tr>
           <th></th>
-          <th></th>
+          <th>Form ID</th>
+          <th>X</th>
+          <th>Y</th>
+          <th>Z</th>
         </tr>
       </thead>
       <tbody></tbody>
       <tfoot>
-        <td colspan=3 class="total-completed"></td>
+        <td colspan=5 class="total-completed"></td>
       </tfoot>
     </table>
   </body>