Merge pull request #107 from aiannacc/v23beta-fixes

V23beta fixes
aiannacc · Sep 11, 2013 · ad00ee8 · ad00ee8
2 parents eb2155f + 807a283
commit ad00ee8
Show file tree

Hide file tree

Showing 4 changed files with 83 additions and 147 deletions.
diff --git a/src/ext/logviewer.css b/src/ext/logviewer.css
@@ -48,6 +48,8 @@ table.vptable tr:last-child, table.vptable td:first-child { border-bottom-left-r
 table.vptable tr:last-child, table.vptable td:last-child { border-bottom-right-radius: 5px; }
 
 table.vptable td {
+  font-size: 16px;
+  //font-family: TrajanPro;
   padding: 0px 4px;
   visibility: inherit;
   border: 1px solid;
@@ -70,37 +72,37 @@ h1.turnheader {
   border-radius: 5px;
 }
 
-.p1 {
+.p0 {
   padding: 0px 3px;
-  background-color: #CC33FF;
+  background-color: #DD55FF;
   border-color: purple;
 }
 
-.p2 {
+.p1 {
   padding: 0px 3px;
   background-color: lightblue;
   border-color: blue;
 }
 
-.p3 {
+.p2 {
   padding: 0px 3px;
   background-color: lightgreen;
   border-color: green;
 }
 
-.p4 {
+.p3 {
   padding: 0px 3px;
   background-color: yellow;
   border-color: orange;
 }
 
-.p5 {
+.p4 {
   padding: 0px 3px;
   background-color: pink;
   border-color: brown;
 }
 
-.p6 {
+.p5 {
   padding: 0px 3px;
   background-color: tan;
   border-color: black;
@@ -189,7 +191,8 @@ h1.turnheader {
 }
 
 .victory, 
-.victoryillustrated {
+.victoryillustrated,
+.victory-potion {
   background-color: rgb(146,193,125);
 }
 
@@ -204,8 +207,7 @@ h1.turnheader {
   background: -moz-linear-gradient(top, rgb(253,225,100), rgb(64,168,227));
 }
 
-.treasure-victory,
-.victory-potion {
+.treasure-victory {
   background: -webkit-linear-gradient(top, rgb(253,225,100), rgb(146,193,125));
   background: -moz-linear-gradient(top, rgb(253,225,100), rgb(146,193,125));
 }

diff --git a/src/ext/logviewer.js b/src/ext/logviewer.js
@@ -6,13 +6,13 @@ var loadLogviewerModule, createLogviewer, resizeLogviewer;
 /*
  * Log viewer module
  */
-loadLogviewerModule = function (gs, cdbc, lm, dw) {
+loadLogviewerModule = function (gs, cdbc, lm, dw, dc) {
     "use strict";   // JSLint setting
 
-    var parseLogLine, logAppendCards, logAppend, logAppendPlayer;
+    var parseLogLine, logAppendCards, logAppend, logAppendPlayer, logNewline;
 
-    // Map from player name to turn order
-    var pname2pindex;
+    // Map from player name to class
+    var pname2pclass;
 
     // Current player/phase
     var gamePhase, logPhase, possessed, gameStarted, gameOver;
@@ -23,6 +23,15 @@ loadLogviewerModule = function (gs, cdbc, lm, dw) {
         gamePhase = opt.dominionPhase || gamePhase;
     });
 
+    gs.alsoDo(dc, 'onIncomingMessage', null, function (msgType, msgData) {
+        if (msgType === 'gameSetup') {
+            pname2pclass = {};
+            msgData.playerInfos.map(function (pinfo) {
+                pname2pclass[pinfo.name] = 'p' + pinfo.playerIndex;
+            });
+        }
+    });
+
     // "Listen" to log additions
     gs.alsoDo(lm, 'addLog', function (opt) {
         if (opt.logUrl) {
@@ -49,7 +58,8 @@ loadLogviewerModule = function (gs, cdbc, lm, dw) {
     }).join('|'), 'g');
 
     // Append a list of formatted cards to the log
-    // Ex: ['Copper', 'Estate'] appends <span class="treasure">Copper</span>, <span class="victory">Estate</span>
+    // Ex: ['Copper', 'Estate'] appends 
+    // <span class="treasure">Copper</span>, <span class="victory">Estate</span>
     logAppendCards = function (cardList) {
         var i, card, cardTitle;
         for (i = 0; i < cardList.length; i += 1) {
@@ -65,12 +75,17 @@ loadLogviewerModule = function (gs, cdbc, lm, dw) {
         }
     };
 
-    logAppendPlayer = function (pname, pindex) {
-        logAppend('<span class="p' + pindex + '">' + pname + '</span>');
+    logAppendPlayer = function (pname) {
+        $('#prettylog').append($('<span>').addClass(pname2pclass[pname])
+                                          .text(pname));
     };
 
     logAppend = function (text) {
-        $('#prettylog').append(text);
+        $('#prettylog').append($('<span>').text(text));
+    };
+
+    logNewline = function () {
+        $('#prettylog').append($('<br>'));
     };
 
     var setupPatt = new RegExp(/^-+ Game Setup -+$/);
@@ -81,42 +96,38 @@ loadLogviewerModule = function (gs, cdbc, lm, dw) {
     var gameOverPatt = new RegExp(/^-+ Game Over -+$/);
 
     parseLogLine = function (line) {
-        var m, pname, pindex;
+        var m, pname, pclass;
 
         if (line.match(setupPatt)) {
             $('#prettylog').empty();
-            pname2pindex = {};
             logAppend($('<h1/>').addClass('gameheader').text('Game Setup'));
             gameStarted = false;
 
         } else if ((m = line.match(supplyPatt)) !== null) {
             logAppend('Supply Cards: ');
             logAppendCards(m[1].split(', '));
-            logAppend('<br>');
+            logNewline();
+
+        } else if ((m = line.match(turnPatt)) !== null) {
+            pname = m[2];
+            pclass = pname2pclass[pname];
+            $('#prettylog').append($('<h1>').addClass('turnheader')
+                                            .addClass(pclass)
+                                            .text(m[1]));
+            gameStarted = true;
 
         } else if ((m = line.match(startingCardsPatt)) !== null) {
             pname = m[1];
-            pindex = _.size(pname2pindex) + 1;
-            pname2pindex[pname] = pindex;
-
             var startingCards = m[2];
-            logAppendPlayer(pname, pindex);
+            logAppendPlayer(pname);
             logAppend(' starting cards: ');
             logAppendCards(m[2].split(', '));
-            logAppend('<br>');
-
-        } else if ((m = line.match(turnPatt)) !== null) {
-            pname = m[2];
-            pindex = pname2pindex[pname];
-            logAppend($('<h1/>').addClass('turnheader')
-                                .addClass('p' + pindex)
-                                .text(m[1]));
-            gameStarted = true;
+            logNewline();
 
         } else if ((m = line.match(actPatt)) !== null) {
             // Parse the log line
             pname = m[1];
-            pindex = pname2pindex[pname];
+            pclass = pname2pclass[pname];
             var action = m[3];
             var rest = m[4] || '';
 
@@ -129,9 +140,9 @@ loadLogviewerModule = function (gs, cdbc, lm, dw) {
             // Print new phase's initial or just indent
             logAppend($('<span/>').addClass('phase')
                                   .addClass(logPhase + 'Phase')
-                                  .html(phaseInitial));
+                                  .text(phaseInitial));
             logAppend(' ');
-            logAppendPlayer(pname, pindex);
+            logAppendPlayer(pname);
             logAppend(' ' + action + ' ');
 
             // Parse out and format card names, vp tokens, coin tokens
@@ -147,15 +158,15 @@ loadLogviewerModule = function (gs, cdbc, lm, dw) {
                     logAppendCards([cards[i]]);
                 }
             }
-            logAppend('<br>');
+            logNewline();
 
         } else if (line.match(gameOverPatt)) {
             logAppend($('<h1/>').addClass('gameheader').text('Game Over'));
             gameOver = true;
 
         } else {
             logAppend(line);
-            logAppend('<br>');
+            logNewline();
         }
     };
 };
@@ -164,6 +175,7 @@ window.GokoSalvager.depWait(
     ['GokoSalvager',
      'FS.Dominion.CardBuilder.Data.cards',
      'Dom.LogManager',
-     'Dom.DominionWindow'],
+     'Dom.DominionWindow',
+     'DominionClient'],
     100, loadLogviewerModule, this, 'Logviewer Module'
 );
diff --git a/src/ext/logviewer.js-scrap b/src/ext/logviewer.js-scrap