tMerge coins/income and food/ncard on player board - hadarawgs - Hadara adaptation for boardgamearena.com
 (HTM) git clone git://git.z3bra.org/hadarawgs.git
 (DIR) Log
 (DIR) Files
 (DIR) Refs
 (DIR) LICENSE
       ---
 (DIR) commit 10807f509070b8a0d42a9f7c56c16622068c0111
 (DIR) parent 502f778f55f31ea96d28ed47d15051152ad4eb31
 (HTM) Author: Willy Goiffon <dev@z3bra.org>
       Date:   Tue,  3 Mar 2020 16:32:40 +0100
       
       Merge coins/income and food/ncard on player board
       
       Diffstat:
         M hadarawgs.css                       |       7 +++----
         M hadarawgs.js                        |       2 +-
         M hadarawgs_hadarawgs.tpl             |      11 ++++-------
       
       3 files changed, 8 insertions(+), 12 deletions(-)
       ---
 (DIR) diff --git a/hadarawgs.css b/hadarawgs.css
       t@@ -29,7 +29,6 @@
                display: inline-block;
        }
        
       -.playerboard_coins    { padding: 2px; background-color: #d1833a; }
        .playerboard_income   { padding: 2px; background-color: #ffff66; }
        .playerboard_military { padding: 2px; background-color: #ffaaaa; }
        .playerboard_culture  { padding: 2px; background-color: #aaaaff; }
       t@@ -40,7 +39,7 @@
         *
         */
        .pp_value { margin-right: 8px; }
       -.cube {
       +.icon {
                width: 16px;
                height: 16px;
                background-repeat: none;
       t@@ -49,5 +48,5 @@
        }
        
        /* TODO: merge all icons into a single image (w/ transparency) */
       -.cube_coins { background-image: url('img/coins.png'); }
       -.cube_food  { background-image: url('img/grape.png'); }
       +.icon_coins { background-image: url('img/coins.png'); }
       +.icon_food  { background-image: url('img/grape.png'); }
 (DIR) diff --git a/hadarawgs.js b/hadarawgs.js
       t@@ -60,7 +60,7 @@ function (dojo, declare) {
                                        dojo.place(this.format_block('jstpl_player_board', board), panel);
        
                                        // Set token values on each player board
       -                                var tokens = ["coins", "income", "military", "culture", "food"];
       +                                var tokens = ["coins", "ncard", "income", "military", "culture", "food"];
                                        tokens.forEach(function (token) {
                                                var cur = $(token +'_p' + player_id);
                                                cur.innerHTML = board[token];
 (DIR) diff --git a/hadarawgs_hadarawgs.tpl b/hadarawgs_hadarawgs.tpl
       t@@ -5,14 +5,11 @@
                <div id="board_p{PLAYER_ID}" class="playerboard whiteblock">
                        <h3 style="color:#{PLAYER_COLOR}" class="icon_{PLAYER_ANIMAL}">{PLAYER_NAME}</h3>
                        <div class="playerboard_resources">
       -                        <div class="playerboard_coins">
       -                                <span id="coins_p{PLAYER_ID}">-</span>
       -                        </div>
                                <div class="playerboard_income">
       -                                <span id="income_p{PLAYER_ID}">-</span>
       +                                <span id="coins_p{PLAYER_ID}">-</span><span class="smalltext">/<span id="income_p{PLAYER_ID}">-</span></span>
                                </div>
                                <div class="playerboard_food">
       -                                <span id="food_p{PLAYER_ID}">-</span>
       +                                <span id="ncard_p{PLAYER_ID}">-</span><span class="smalltext">/<span id="food_p{PLAYER_ID}">-</span></span>
                                </div>
                                <div class="playerboard_military">
                                        <span id="military_p{PLAYER_ID}">-</span>
       t@@ -27,8 +24,8 @@
        
        <script type="text/javascript">
                var jstpl_player_board = '<div class="pp_board">\
       -                <div class="cube cube_coins"></div><span class="pp_value pp_coins">${coins}<span class="smalltext">/${income}</span></span>\
       -                <div class="cube cube_food "></div><span class="pp_value pp_food ">${ncard}<span class="smalltext">/${food}</span></span>\
       +                <div class="icon icon_coins"></div><span class="pp_value pp_coins">${coins}<span class="smalltext">/${income}</span></span>\
       +                <div class="icon icon_food "></div><span class="pp_value pp_food ">${ncard}<span class="smalltext">/${food}</span></span>\
                        </div>';
        </script>