Explorar o código

FEw improvements here and there:

 - Fix in the stat table on the monster info preventing the rest of the page to load.
 - Fix essence icon borders.
 - Added Lumel's Rune Ore icon.
 - Arcane Tower now only appears once in the building list.
 - Skill table now looks nicer in the catalog and monster sections.
 - Fixed several warnings.
Iñigo Valentin %!s(int64=6) %!d(string=hai) anos
pai
achega
89aa3b4668

+ 1 - 1
application/Constant.php

@@ -1187,7 +1187,7 @@
          * Devilmon.
          */
         const DEVILMON = 151050101;
-        
+
         /**
          * Super Angelmon.
          */

+ 2 - 3
application/entity/K_Inventory.php

@@ -17,7 +17,7 @@
      *
      * Represents an object from the table 'k_inventory'.
      *
-     * @category Entity 
+     * @category Entity
      */
     class K_Inventory extends Entity{
 
@@ -35,7 +35,7 @@
          * @var string Item type name.
          */
         public $type;
-        
+
         /**
          * @var string Item description.
          */
@@ -72,7 +72,6 @@
             $q = $db->query($s);
             $r = $q->fetchArray(SQLITE3_ASSOC);
             $this->type = $r["type"];
-            $this->amount = $r["amount"];
             $this->id = $r["id"];
             $this->name = HTML::e($r["name"]);
             $this->description = HTML::e($r["description"]);

+ 2 - 2
application/entity/K_Leader_Skill.php

@@ -114,10 +114,10 @@
                 case STAT_ID::CRIT_DMG:
                     $s .= "critical damage";
                     break;
-                case STAT_ID::ACC:
+                case STAT_ID::ACCURACY:
                     $s .= "accuracy";
                     break;
-                case STAT_ID::RES:
+                case STAT_ID::RESIST:
                     $s .= "resistance";
                     break;
             }

+ 3 - 3
application/page/Fusion_Page.php

@@ -70,7 +70,7 @@
         private function parse_filters(){
             $this->filters = FILTER::FUSION;
             if (isset($_GET["product"]) && intval($_GET["product"]) > 0){
-                $this->filters["product"] = $_GET["product"];
+                $this->filters["PRODUCT"] = $_GET["product"];
             }
             return;
         }
@@ -86,8 +86,8 @@
               "SELECT DISTINCT product " .
               "FROM k_fusion " .
               "WHERE stars = 5 ";
-            if ($this->filters["product"] > 0){
-                $s = $s . " AND product = " . $this->filters["product"] . " ";
+            if ($this->filters["PRODUCT"] > 0){
+                $s = $s . " AND product = " . $this->filters["PRODUCT"] . " ";
             }
             $s = $s . "ORDER BY stars DESC;";
             return $s;

+ 10 - 3
application/page/Home_Page.php

@@ -193,9 +193,16 @@
                 array_push($this->defense, new Unit($r["unit"], false));
             }
             $s = "
-                SELECT DISTINCT id
-                FROM building
-                WHERE uid = '$UID';
+                SELECT
+                  building.id,
+                  min(building)
+                FROM
+                  building,
+                  k_building
+                WHERE
+                  uid = '$UID' AND
+                  building.building = k_building.id 
+                GROUP BY building.building;
             ";
             $q = $db->query($s);
             while ($r = $q->fetchArray(SQLITE3_ASSOC)){

+ 2 - 2
application/page/Monster_Page.php

@@ -35,11 +35,11 @@
             "spd" => 0,
             "crd" => 0,
             "elm" => [
-                0 => 0,
                 1 => 0,
                 2 => 0,
                 3 => 0,
-                4 => 0
+                4 => 0,
+                5 => 0
             ]
         ];
 

+ 2 - 2
application/page/Report_Skillup_Page.php

@@ -77,7 +77,7 @@
                 $this->filters["MAXED"] = true;
             }
             if (isset($_GET["2a"]) && $_GET["2a"] == "on"){
-                $this->filters["2a"] = true;
+                $this->filters["2A"] = true;
             }
             if (isset($_GET["homunculus"]) && $_GET["homunculus"] == "on"){
                 $this->filters["HOMUNCULUS"] = true;
@@ -119,7 +119,7 @@
                 unit.stars >= " . $this->filters["MIN_STARS"] . " AND
                 unit.stars <= " . $this->filters["MAX_STARS"]
             ;
-            if ($this->filters["2a"]){
+            if ($this->filters["2A"]){
                 $s = $s . "
                     AND ((
                       k_unit.natural_stars >= " . $this->filters["MIN_NATURAL_STARS"] . " AND

+ 0 - 1
application/page/Runes_Page.php

@@ -56,7 +56,6 @@
             else{
                 $s = $this->build_custom_query($_GET["custom_filter"]);
             }
-            error_log($s);
             $q = $db->query($s);
             while ($r = $q->fetchArray(SQLITE3_ASSOC)){
                 $rune = new Rune($r["id"]);

+ 2 - 3
application/view/fusion.php

@@ -69,7 +69,6 @@
             <article id='filters_content'>
 <?php
                 $filters = $page->filters;
-                $custom_filters = $page->custom_filters;
                 include __DIR__ . "/inc/filter_fusion.php";
 ?>
             </article>
@@ -279,7 +278,7 @@
 <?php
                                                         foreach ($sub_fusion->ingredient_unawaken[$num]->essences as $essence){
 ?>
-                                                            <div class='essence border_<?=$essence["element"]?>'>
+                                                            <div class='essence border_<?=explode(" ", $essence["item"]->name)[2]?>'>
                                                                 <img alt='<?=$essence["item"]->name?>' title='<?=$essence["amount"]?>x <?=$essence["item"]->name?>' class='essence' src='<?=$essence["item"]->get_image()?>'/>
                                                                 <span>
                                                                     <?=$essence["amount"]?>
@@ -390,7 +389,7 @@
 <?php
                                         foreach ($fusion->ingredient_unawaken[0]->essences as $essence){
 ?>
-                                            <div class='essence border_<?=$essence["element"]?>'>
+                                            <div class='essence border_<?=explode(" ", $essence["item"]->name)[2]?>'>
                                                 <img alt='<?=$essence["item"]->name?>' title='<?=$essence["amount"]?>x <?=$essence["item"]->name?>' class='essence' src='<?=$essence["item"]->get_image()?>'/>
                                                 <span>
                                                     <?=$essence["amount"]?>

+ 3 - 3
application/view/inc/filter_report_runeupgrade.php

@@ -36,11 +36,11 @@
         </script>
         <form action='/<?=$UID?>/report/runeupgrade/' method='get' id='custom_filter_runes' class='custom_filter'>
             <span class='custom_filter_title'>Custom filters:</span>
-            <select name='custom_filter' onChange='customFilterDescription(this.value);' onload='customFilterDescription("<?=$_GET["custom_filter"]?>");'>
+            <select name='custom_filter' onChange='customFilterDescription(this.value);' onload='customFilterDescription("<?=filter_input(INPUT_GET, 'custom_filter')?>");'>
                 <option> </option>
 <?php
                  foreach($custom_filters AS $filter){
-                    if ($_GET["custom_filter"] == $filter->id){
+                    if (filter_input(INPUT_GET, 'custom_filter') == $filter->id){
                         $selected = "selected='selected'";
                     }
                     else{
@@ -55,7 +55,7 @@
             <input type='submit' value='Apply'/>
             <p id='custom_filter_description'> </p>
             <script>
-                customFilterDescription("<?=$_GET["custom_filter"]?>");
+                customFilterDescription("<?=filter_input(INPUT_GET, 'custom_filter')?>");
             </script>
         </form>
 <?php

+ 8 - 8
application/view/inc/filter_runes.php

@@ -34,11 +34,11 @@
         </script>
         <form action='/<?=$UID?>/runes/' method='get' id='custom_filter_runes' class='custom_filter'>
             <span class='custom_filter_title'>Custom filters:</span>
-            <select name='custom_filter' onChange='customFilterDescription(this.value);' onload='alert("LOAD");customFilterDescription("<?=$_GET["custom_filter"]?>");'>
+            <select name='custom_filter' onChange='customFilterDescription(this.value);' onload='alert("LOAD");customFilterDescription("<?=filter_input(INPUT_GET, 'custom_filter')?>");'>
                 <option> </option>
 <?php
                  foreach($custom_filters AS $filter){
-                    if ($_GET["custom_filter"] == $filter->id){
+                    if (filter_input(INPUT_GET, 'custom_filter') == $filter->id){
                         $selected = "selected='selected'";
                     }
                     else{
@@ -53,7 +53,7 @@
             <input type='submit' value='Apply'/>
             <p id='custom_filter_description'> </p>
             <script>
-                customFilterDescription("<?=$_GET["custom_filter"]?>");
+                customFilterDescription("<?=filter_input(INPUT_GET, 'custom_filter')?>");
             </script>
         </form>
 <?php
@@ -68,7 +68,7 @@
                 <select multiple name='type[]' id='filter_type'>
 <?php
 
-                    $reflect = new ReflectionClass(RUNE_SET_ID);
+                    $reflect = new ReflectionClass("RUNE_SET_ID");
                     foreach($reflect->getConstants() as $name => $id){
                         $selected = "";
                         if (in_array($id, $filters["TYPE"])){
@@ -120,7 +120,7 @@
                 <span>Main stat:</span>
                 <select multiple name='main_stat[]' id='filter_main_stat'>
 <?php
-                    $reflect = new ReflectionClass(RUNE_STAT_ID);
+                    $reflect = new ReflectionClass("RUNE_STAT_ID");
                     foreach($reflect->getConstants() as $name => $id){
                         $selected = "";
                         if (in_array($id, $filters["MAIN"])){
@@ -128,7 +128,7 @@
                         }
                         $name_format = ucwords(str_replace("_P", "%", $name));
 ?>
-                        <option value='<?=$n?>' <?=$selected?>><?=$name_format?></option>
+                        <option value='<?=$id?>' <?=$selected?>><?=$name_format?></option>
 <?php
                     }
 ?>
@@ -138,7 +138,7 @@
                 <span>Has sub stat:</span>
                 <select multiple name='sub_stat[]' id='filter_sub_stat'>
 <?php
-                    $reflect = new ReflectionClass(RUNE_STAT_ID);
+                    $reflect = new ReflectionClass("RUNE_STAT_ID");
                     foreach($reflect->getConstants() as $name => $id){
                         $selected = "";
                         if (in_array($id, $filters["SUB"])){
@@ -146,7 +146,7 @@
                         }
                         $name_format = ucwords(str_replace("_P", "%", $name));
 ?>
-                        <option value='<?=$n?>' <?=$selected?>><?=$name_format?></option>
+                        <option value='<?=$id?>' <?=$selected?>><?=$name_format?></option>
 <?php
                     }
 ?>

+ 1 - 0
application/view/monster.php

@@ -421,6 +421,7 @@
                                         <span class='description <?=$aquired?>'>
                                             <?=$level->description?>
                                         </span>
+                                        <br/>
 <?php
                                     }
                                 }

+ 164 - 63
application/view/monster_info.php

@@ -155,7 +155,7 @@
 <?php
                                     foreach ($page->monster[$i]->essences as $essence){
 ?>
-                                       <div class='essence border_<?=$essence["element"]?>'>
+                                       <div class='essence border_<?=explode(" ", $essence["item"]->name)[2]?>'>
                                             <img alt='<?=$essence["item"]->name?>' title='<?=$essence["amount"]?>x <?=$essence["item"]->name?>' class='essence' src='<?=$essence["item"]->get_image()?>'/>
                                             <span>
                                                 <?=$essence["amount"]?>
@@ -190,6 +190,25 @@
                                         <span class='skill_level'>
                                             &nbsp;
                                         </span>
+                                    </td>
+<?php
+                                }
+                                $skill_num = 0;
+                                foreach ($page->monster[$i]->skill as $skill){
+                                    $skill_num ++;
+?>
+                                    <td class='skill'>
+                                        <img class='skill_img' src='<?=$skill->get_image()?>'/>
+                                    </td>
+<?php
+                                }
+?>
+                            </tr>
+                            <tr>
+<?php
+                                if ($page->monster[$i]->leader_skill){
+?>
+                                    <td>
                                         <span class='skill_name'>
                                             Leader skill
                                         </span>
@@ -201,77 +220,107 @@
                                 }
                                 foreach ($page->monster[$i]->skill as $skill){
 ?>
-                                    <td class='skill'>
-                                        <img class='skill_img' src='<?=$skill->get_image()?>'/>
+                                    <td>
                                         <span class='skill_name'>
                                             <?=$skill->name?>
                                         </span>
                                         <span class='skill_description'>
                                             <?=$skill->description?>
                                         </span>
+                                    </td>
 <?php
-                                        if (strlen($skill->multiplier_formula) > 0){
+                                }
 ?>
-                                            <span class='skill_formula'>
-                                                <?=$skill->multiplier_formula?>
-                                            </span>
+                            </tr>
+                            <tr>
 <?php
-                                        }
-                                        if (count($skill->effect) > 0){
+                                if ($page->monster[$i]->leader_skill){
 ?>
-                                            <span class='skill_effects'>
+                                    <td></td>
 <?php
-                                                foreach ($skill->effect as $effect){
+                                }
+                                foreach ($page->monster[$i]->skill as $skill){
 ?>
-                                                    <img class='effect_img' title='<?=$effect->name?>' src='<?=$effect->get_image()?>'/>
+                                    <td>
+                                        <span class='skill_formula'>
+                                            <?=$skill->multiplier_formula?>
+                                        </span>
+                                    </td>
 <?php
-                                                }
+                                }
 ?>
-                                            </span>
+                            </tr>
+                            <tr>
 <?php
-                                        }
-                                        if ($skill->max_level > 1){
+                                if ($page->monster[$i]->leader_skill){
 ?>
-                                            <table class='skill_up'>
+                                    <td></td>
 <?php
-                                                foreach ($skill->level as $level){
-                                                    if ($level->level > 1){
+                                }
+                                foreach ($page->monster[$i]->skill as $skill){
 ?>
-                                                        <tr>
-                                                            <td class='level'>
-                                                                Lv. <?=$level->level?>
-                                                            </td>
-                                                            <td class='description'>
-                                                                <?=$level->description?>
-                                                            </td>
-                                                        </tr>
+                                    <td>
+                                        <span class='skill_effects'>
 <?php
-                                                    }
-                                                }
+                                            foreach ($skill->effect as $effect){
+?>
+                                                <img class='effect_img' title='<?=$effect->name?>' src='<?=$effect->get_image()?>'/>
+<?php
+                                            }
+?>
+                                        </span>
+                                    </td>
+<?php
+                                }
+?>
+                            </tr>
+                            <tr>
+<?php
+                                if ($page->monster[$i]->leader_skill){
 ?>
-                                            </table>
+                                    <td></td>
+<?php
+                                }
+                                $skill_num = 0;
+                                foreach ($page->monster[$i]->skill as $skill){
+?>
+                                    <td class='skill_up'>
+<?php
+                                        foreach ($skill->level as $level){
+                                            if ($level->level > 1){
+?>
+                                                <span class='level'>
+                                                    Lv. <?=$level->level?>
+                                                </span>
+                                                <span class='description'>
+                                                    <?=$level->description?>
+                                                </span>
+                                                <br/>
 <?php
+                                            }
                                         }
 ?>
                                     </td>
 <?php
+                                    $skill_num ++;
                                 }
 ?>
                             </tr>
-                        </table> <!-- #skills -->
+                        </table>
+
 <?php
                         if ($page->monster[$i]->transformation != null){
 ?>
-                            <table class='skills'>
+                            <table class='skills skills_transformation'>
                                 <tr>
 <?php
-                                    $colspan = sizeof($page->monster[$i]->skill);
+                                    $colspan = sizeof($page->monster[$i]->transformation->skill);
                                     if ($page->monster[$i]->leader_skill){
                                         $colspan ++;
                                     }
 ?>
                                     <th colspan='<?=$colspan?>'>
-                                        Skills (transformation)
+                                        Skills (transformed)
                                     </th>
                                 </tr>
                                 <tr>
@@ -283,6 +332,29 @@
                                             <span class='skill_level'>
                                                 &nbsp;
                                             </span>
+                                        </td>
+<?php
+                                    }
+                                    $skill_num = 0;
+                                    $absolute_level = 0;
+                                    $absolute_max_level = 0;
+                                    $ponderated_level = 0;
+                                    $ponderated_max_level = 0;
+                                    foreach ($page->monster[$i]->transformation->skill as $skill){
+                                        $skill_num ++;
+?>
+                                        <td class='skill'>
+                                            <img class='skill_img' src='<?=$skill->get_image()?>'/>
+                                        </td>
+<?php
+                                    }
+?>
+                                </tr>
+                                <tr>
+<?php
+                                    if ($page->monster[$i]->leader_skill){
+?>
+                                        <td>
                                             <span class='skill_name'>
                                                 Leader skill
                                             </span>
@@ -294,60 +366,89 @@
                                     }
                                     foreach ($page->monster[$i]->transformation->skill as $skill){
 ?>
-                                        <td class='skill'>
-                                            <img class='skill_img' src='<?=$skill->get_image()?>'/>
+                                        <td>
                                             <span class='skill_name'>
                                                 <?=$skill->name?>
                                             </span>
                                             <span class='skill_description'>
                                                 <?=$skill->description?>
                                             </span>
+                                        </td>
 <?php
-                                            if (strlen($skill->multiplier_formula) > 0){
+                                    }
 ?>
-                                                <span class='skill_formula'>
-                                                    <?=$skill->multiplier_formula?>
-                                                </span>
+                                </tr>
+                                <tr>
 <?php
-                                            }
-                                            if (count($skill->effect) > 0){
+                                    if ($page->monster[$i]->leader_skill){
 ?>
-                                                <span class='skill_effects'>
+                                        <td></td>
 <?php
-                                                    foreach ($skill->effect as $effect){
+                                    }
+                                    foreach ($page->monster[$i]->transformation->skill as $skill){
 ?>
-                                                        <img class='effect_img' title='<?=$effect->name?>' src='<?=$effect->get_image()?>'/>
+                                        <td>
+                                            <span class='skill_formula'>
+                                                <?=$skill->multiplier_formula?>
+                                            </span>
+                                        </td>
 <?php
-                                                    }
+                                    }
 ?>
-                                                </span>
+                                </tr>
+                                <tr>
 <?php
-                                            }
-                                            if ($skill->max_level > 1){
+                                    if ($page->monster[$i]->leader_skill){
+?>
+                                        <td></td>
+<?php
+                                    }
+                                    foreach ($page->monster[$i]->transformation->skill as $skill){
+?>
+                                        <td>
+                                            <span class='skill_effects'>
+<?php
+                                                foreach ($skill->effect as $effect){
+?>
+                                                    <img class='effect_img' title='<?=$effect->name?>' src='<?=$effect->get_image()?>'/>
+<?php
+                                                }
+?>
+                                            </span>
+                                        </td>
+<?php
+                                    }
 ?>
-                                                <table class='skill_up'>
+                                </tr>
+                                <tr>
+<?php
+                                    if ($page->monster[$i]->leader_skill){
+?>
+                                        <td></td>
 <?php
-                                                    foreach ($skill->level as $level){
-                                                        if ($level->level > 1){
+                                    }
+                                    $skill_num = 0;
+                                    foreach ($page->monster[$i]->transformation->skill as $skill){
 ?>
-                                                            <tr>
-                                                                <td class='level'>
-                                                                    Lv. <?=$level->level?>
-                                                                </td>
-                                                                <td class='description'>
-                                                                    <?=$level->description?>
-                                                                </td>
-                                                            </tr>
+                                        <td class='skill_up'>
 <?php
-                                                        }
-                                                    }
+                                            foreach ($skill->level as $level){
+                                                if ($level->level > 1){
 ?>
-                                                </table>
+                                                    <span class='level'>
+                                                        Lv. <?=$level->level?>
+                                                    </span>
+                                                    <span class='description'>
+                                                        <?=$level->description?>
+                                                    </span>
+                                                    <br/>
 <?php
+                                                }
                                             }
 ?>
                                         </td>
 <?php
+                                        $skill_num ++;
                                     }
 ?>
                                 </tr>

+ 0 - 1
application/view/monsters.php

@@ -69,7 +69,6 @@
             <article id='filters_content'>
 <?php
                 $filters = $page->filters;
-                $custom_filters = $page->custom_filters;
                 include __DIR__ . "/inc/filter_monsters.php";
 ?>
             </article>

+ 0 - 1
application/view/report_skillup.php

@@ -68,7 +68,6 @@
             <article id='filters_content'>
 <?php
                 $filters = $page->filters;
-                $custom_filters = $page->custom_filters;
                 include __DIR__ . "/inc/filter_report_skillup.php";
 ?>
             </article>

+ 25 - 2
application/view/stats.php

@@ -550,6 +550,13 @@
                             Victory rate
                         </h3>
                         <canvas id='diagram_win' width='200' height='200'></canvas>
+<?php
+                        $total = $page->win_lose[0] + $page->win_lose[1];
+                        // Fix divisions by 0 (dont use in total count):
+                        if ($total == 0){
+                            $total ++;
+                        }
+?>
                         <table class='legend'>
                             <tr class='color_1'>
                                 <td>
@@ -559,7 +566,7 @@
                                     <?=$page->win_lose[0]?>
                                 </td>
                                 <td>
-                                    (<?=number_format(($page->win_lose[0] * 100) / ($page->win_lose[0] + $page->win_lose[1]), 2, ".", ",")?>%)
+                                    (<?=number_format(($page->win_lose[0] * 100) / $total, 2, ".", ",")?>%)
                                 </td>
                             </tr>
                             <tr class='color_2'>
@@ -570,7 +577,7 @@
                                     <?=$page->win_lose[1]?>
                                 </td>
                                 <td>
-                                    (<?=number_format(($page->win_lose[1] * 100) / ($page->win_lose[0] + $page->win_lose[1]), 2, ".", ",")?>%)
+                                    (<?=number_format(($page->win_lose[1] * 100) / $total, 2, ".", ",")?>%)
                                 </td>
                             </tr>
                             <tr class='color_0'>
@@ -598,6 +605,10 @@
                             $shap = $page->drop_type["shapeshifting"];
                             $unit = $page->drop_type["unit"];
                             $total = $rune + $rucr + $item + $sedu + $shap + $unit;
+                            // Fix divisions by 0:
+                            if ($total == 0){
+                                $total ++;
+                            }
 ?>
                             <tr class='color_1'>
                                 <td>
@@ -675,6 +686,10 @@
                         <table class='legend'>
 <?php
                             $total = array_sum($page->drop_rune_slot);
+                            // Fix divisions by 0:
+                            if ($total == 0){
+                                $total ++;
+                            }
                             for ($i = 1; $i <= 6; $i ++){
                                 $val = $page->drop_rune_slot[strval($i)]
 ?>
@@ -702,6 +717,10 @@
                         <table class='legend'>
 <?php
                             $total = array_sum($page->drop_rune_stars);
+                            // Fix divisions by 0:
+                            if ($total == 0){
+                                $total ++;
+                            }
                             for ($i = 6; $i >= 1; $i --){
                                 $val = $page->drop_rune_stars[strval($i)]
 ?>
@@ -735,6 +754,10 @@
                         <table class='legend'>
 <?php
                             $total = array_sum($page->drop_rune_quality);
+                            // Fix divisions by 0:
+                            if ($total == 0){
+                                $total ++;
+                            }
 ?>
                             <tr class='color_legend'>
                                 <td>

+ 19 - 6
public/css/monster.css

@@ -99,17 +99,29 @@ section#monster article#profile table#skills{
     margin: 1em auto;
     color: #ffffff;
     text-align: center;
-    width: 98%;
+    width: 90%;
     position: relative;
     border-collapse: collapse;
     table-layout: fixed;
+    border-top: 3px solid #c8ad78;
+    border-bottom: 3px solid #c8ad78;
 }
 
-section#monster article#profile table#skills th{border: none;}
+section#monster article#profile table#skills th{
+    border-left: 3px solid #c8ad78;
+    border-right: 3px solid #c8ad78;
+    border-bottom: 3px solid #c8ad78;
+    font-size: 150%;
+    padding: 0.5em;
+    background-color: #00000044;
+}
 
 section#monster article#profile table#skills td{
     vertical-align: top;
     padding: 0.2em 0.5em;
+    border-right: 3px solid #c8ad78;
+    border-left: 3px solid #c8ad78;
+    background-color: #ffffff33;
 }
 
 section#monster article#profile table#skills img.skill_img{
@@ -117,6 +129,7 @@ section#monster article#profile table#skills img.skill_img{
     height: 4em;
     border: 0.15em solid var(--ui-color-border);
     border-radius: 0.4em;
+    margin-top: 1em;
 }
 section#monster article#profile table#skills span.skill_level{
     font-size: 100%;
@@ -152,7 +165,7 @@ section#monster article#profile table#skills span.skill_formula{
     display: block;
     text-align: center;
     margin-top: 1em;
-    font-size: 50%;
+    font-size: 80%;
     color: #cccccc;
     font-weight: bold;
     font-style: italic;
@@ -165,8 +178,8 @@ section#monster article#profile table#skills span.skill_effects{
 }
 
 section#monster article#profile table#skills span.skill_effects img.effect_img{
-    width: 1.5em;
-    height: 1.5em;
+    width: 2em;
+    height: 2em;
     border: 0.1em solid #000000;
     border-radius: 0.5em;
 }
@@ -174,7 +187,7 @@ section#monster article#profile table#skills span.skill_effects img.effect_img{
 section#monster article#profile table#skills td.skill_up{
     margin: 0.5em auto 0 auto;
     border-collapse: collapse;
-    font-size: 70%;
+    font-size: 80%;
     color: #999999;
     font-style: italic;
 }

+ 49 - 51
public/css/monster_info.css

@@ -35,7 +35,7 @@ article.stage div.profile{
 }
 
 article.stage table.stats{
-    font-size: 65%;
+    font-size: 75%;
     border: 0.1em solid black;
     color: #ffffff;
     margin: 0.4em;
@@ -46,7 +46,7 @@ article.stage table.stats{
     max-width: 10em;
 }
 
-article.stage table.stats td,th{
+article.stage table.stats td, article.stage table.stats th{
     padding: 0.01em 0.5em;
     border: 0.1em solid #000000;
 }
@@ -114,38 +114,52 @@ article.stage div.extra div.essences div.essence span{
 }
 
 article.stage table.skills{
-    width: 100%;
+    display: block;
+    vertical-align: top;
+    margin: 1em auto;
+    color: #ffffff;
     text-align: center;
-    margin: 1em 0 0 0;
-    padding: 0;
+    width: 90%;
+    position: relative;
+    border-collapse: collapse;
     table-layout: fixed;
+    border-top: 3px solid #c8ad78;
+    border-bottom: 3px solid #c8ad78;
 }
 
-article.stage table.skills tr th{border: none;}
+article.stage table.skills th{
+    border-left: 3px solid #c8ad78;
+    border-right: 3px solid #c8ad78;
+    border-bottom: 3px solid #c8ad78;
+    font-size: 150%;
+    padding: 0.5em;
+    background-color: #00000066;
+}
 
-article.stage table.skills tr td.skill{
+article.stage table.skills td{
     vertical-align: top;
-    margin: 0.2em;
-    color: #ffffff;
-    text-align: center;
-    max-width: 20%;
+    padding: 0.2em 0.5em;
+    border-right: 3px solid #c8ad78;
+    border-left: 3px solid #c8ad78;
+    background-color: #ffffff33;
 }
 
-article.stage table.skills tr td.skill img.skill_img{
-    width: 3em;
-    height: 3em;
+article.stage table.skills img.skill_img{
+    width: 4em;
+    height: 4em;
     border: 0.15em solid var(--ui-color-border);
-    border-radius: 0.5em;
+    border-radius: 0.4em;
+    margin-top: 1em;
 }
 
-article.stage table.skills tr td.skill span.skill_name{
+article.stage table.skills span.skill_name{
     text-shadow: 0 0 0.2em #000000, 0 0 0.2em #000000, 0 0 0.4em #000000;
+    margin: 0 0 0.5em 0;
     display: block;
     font-weight: bold;
-    font-size: 90%;
 }
 
-article.stage table.skills tr td.skill span.skill_description{
+article.stage table.skills span.skill_description{
     font-size: 80%;
     font-style: italic;
     margin: 0;
@@ -154,60 +168,44 @@ article.stage table.skills tr td.skill span.skill_description{
     line-height: 0.95em;
 }
 
-article.stage table.skills tr td.skill span.skill_formula{
+article.stage table.skills span.skill_formula{
     display: block;
     text-align: center;
     margin-top: 1em;
-    font-size: 50%;
+    font-size: 80%;
     color: #cccccc;
     font-weight: bold;
     font-style: italic;
     font-family: monospace, monospace;
 }
 
-article.stage table.skills tr td.skill span.skill_effects{
+article.stage table.skills span.skill_effects{
     display: block;
     text-align: center;
-    margin-top: 0.5em;
 }
 
-article.stage table.skills tr td.skill span.skill_effects img.effect_img{
-    width: 1.5em;
-    height: 1.5em;
+article.stage table.skills span.skill_effects img.effect_img{
+    width: 2em;
+    height: 2em;
     border: 0.1em solid #000000;
     border-radius: 0.5em;
 }
 
-article.stage table.skills tr td.skill table.skill_up{
-    font-size: 70%;
+article.stage table.skills td.skill_up{
     margin: 0.5em auto 0 auto;
     border-collapse: collapse;
+    font-size: 80%;
+    color: #efefef;
+    font-style: italic;
 }
 
-
-article.stage table.skills tr td.skill table.skill_up td{
-    font-size: 90%;
-    padding: 0.2em;
-    border: 0 solid #000000;
-    line-height: 1em;
-}
-@media screen and (max-width : 990px){
-    article.stage table.skills tr td.skill table.skill_up td{
-        padding: 0;
-        border: 0.1em solid black;
-        line-height: 0.95em;
-        font-size: 70%;
-    }
+article.stage table.skills td.skill_up span.level{
+    width: 3em;
+    display: inline-block;
 }
-
-article.stage table.skills tr td.skill table.skill_up td.level{
+article.stage table.skills td.skill_up span.description{
     font-style: italic;
-    padding-right: 0.8em;
-    min-width: 2em;
-    font-size: 80%
-}
-@media screen and (max-width : 990px){
-    article.stage table.skills tr td.skill table.skill_up td.level{
-        font-size: 70%
-    }
+    min-width: 6em;
+    display: inline-block;
+    width: 70%;
 }

+ 1 - 0
public/css/runs.css

@@ -65,6 +65,7 @@ table#runs td.team div.helper{
 
 table#runs td.team div.monster_panel.disabled{
     opacity: 0.5;
+    vertical-align: top;
 }
 
 table#runs td.time{

BIN=BIN
public/img/inventory/000009003.png