Minor fixes here and there.

application/Constant.php

@@ -55,8 +55,8 @@
     ];
 
     $EFFECT_AREA = [
-        "GENERAL" => 0,
-        "ARENA" => 1,
+        "GENERAL" => 1,
+        "ARENA" => 3,
         "DUNGEON" => 2,
         "GUILD" => 5,
     ];

application/entity/K_Unit.php

@@ -331,15 +331,15 @@
                 $this->load_skills();
                 $this->load_sources();
             }
-            if ($this->awakens_from == "" && $this->awakens_to == ""){
+            if (strlen($this->awakens_from) > 0 && $this->awakens_to == ""){
                 // No to, no from, silver monster.
                 $this->title = $this->element_name . " " . $this->name;
             }
-            elseif ($this->awakens_from =! "" && $this->awakens_to == ""){
+            elseif (strlen($this->awakens_from) > 0 && $this->awakens_to == ""){
                 // Already awakened
                 $this->title = $this->name;
             }
-            elseif ($this->awakens_to =! ""){
+            elseif (strlen($this->awakens_to) > 0){
                 // Awakeable.
                 $this->title = $this->element_name . " " . $this->name;
             }

application/helper/html.php

@@ -23,21 +23,26 @@
         }
         $html = "";
         if ($k->awakens_from == "" && $k->awakens_to == ""){
+            error_log("COND1");
             // No to, no from, silver monster.
             $star_class ="star_silver";
         }
-        elseif ($k->awakens_from =! "" && $k->awakens_to == ""){
+        elseif ($k->awakens_from != ""){
+            error_log("COND2");
             // Already awakened
             if ($k->base_stars - $k->natural_stars == 1){
+                error_log("COND2.1");
                 // Normal awaken.
                 $star_class ="star_purple";
             }
             else{
+                error_log("COND2.2");
                 // Second awaken.
                 $star_class ="star_red";
             }
         }
-        elseif ($k->awakens_to =! ""){
+        elseif ($k->awakens_to != ""){
+            error_log("COND3");
             // Awakeable.
             $star_class ="star_gold";
         }

application/page/Monster_Info_Page.php

@@ -72,18 +72,21 @@
                 $title = $this->monster[1]->name . " - " .$this->monster[0]->element_name . " " . $this->monster[0]->name;
             }
 
-            $s =
-              "SELECT " .
-              "  id, " .
-              "  element " .
-              "FROM k_monster " .
-              "WHERE " .
-              "  family_id = " . $monster->family_id . " AND " .
-              "  element <> '" . $monster->element . "';";
+            // TODO REWORK
+            /*$s = "
+              SELECT
+                id,
+                element
+              FROM k_unit
+              WHERE
+                family = " . $monster->family . " AND
+                base_stars 
+                element <> " . $monster->element . ";
+            ";
             $q_mon = $this->db->query($s);
             while ($r = $q_mon->fetchArray(SQLITE3_ASSOC)){
                 $this->family[$r["element"]] = $r["id"];
-            }
+            }*/
 
             $this->title = $title ." - SWDB";
             $this->description = $title . " info - SWDB";

application/page/Monster_Page.php

@@ -57,38 +57,40 @@
          * $building_stats array.
          */
         private function calculate_buildings(){
+            global $STAT;
             global $EFFECT_AREA;
-            $s =
-              "SELECT " .
-              "  affected_stat, " .
-              "  bonus, " .
-              "  element " .
-              "FROM " .
-              "  k_decoration, " .
-              "  k_decoration_level, " .
-              "  decoration " .
-              "WHERE " .
-              "  k_decoration.id = decoration.decoration AND " .
-              "  decoration.decoration = k_decoration_level.decoration AND " .
-              "  decoration.level = k_decoration_level.level AND " .
-              "  area = " . $EFFECT_AREA["GENERAL"] . " AND " .
-              "  affected_stat IS NOT NULL;";
+            $s = "
+              SELECT
+                affected_stat,
+                bonus,
+                element
+              FROM
+                k_decoration,
+                k_decoration_level,
+                decoration
+              WHERE
+                k_decoration.id = decoration.decoration AND
+                decoration.decoration = k_decoration_level.decoration AND
+                decoration.level = k_decoration_level.level AND
+                area = " . $EFFECT_AREA["GENERAL"] . " AND
+                affected_stat IN (" . $STAT["ATK"] . ", " . $STAT["DEF"] . ", " . $STAT["HP"] . ", " . $STAT["SPD"] . ", " . $STAT["CRIT_DMG"] . ");
+            ";
             $q = $this->db->query($s);
             while ($r = $q->fetchArray(SQLITE3_ASSOC)){
                 switch($r["affected_stat"]){
-                    case "DEF":
+                    case $STAT["DEF"]:
                         $this->building_stats["def"] += $r["bonus"];
                         break;
-                    case "HP":
+                    case $STAT["HP"]:
                         $this->building_stats["hp"] += $r["bonus"];
                         break;
-                    case "SPD":
+                    case $STAT["SPD"]:
                         $this->building_stats["spd"] += $r["bonus"];
                         break;
-                    case "CRI Dmg":
+                    case $STAT["CRIT_DMG"]:
                         $this->building_stats["crd"] += $r["bonus"];
                         break;
-                    case "ATK":
+                    case $STAT["ATK"]:
                         if(strlen($r["element"]) > 0){
                             $this->building_stats["elm"][$r["element"]] += $r["bonus"];
                         }

application/page/Monsters_Page.php

@@ -137,6 +137,7 @@
          */
         private function calculate_buildings(){
             global $STAT;
+            global $EFFECT_AREA;
             $s = "
               SELECT
                 affected_stat,
@@ -150,8 +151,8 @@
                 k_decoration.id = decoration.decoration AND
                 decoration.decoration = k_decoration_level.decoration AND
                 decoration.level = k_decoration_level.level AND
-                area = 'Everywhere' AND
-                affected_stat IN ('ATK', 'DEF', 'HP', 'SPD', 'CRI Dmg');
+                area = " . $EFFECT_AREA["GENERAL"] . " AND
+                affected_stat IN (" . $STAT["ATK"] . ", " . $STAT["DEF"] . ", " . $STAT["HP"] . ", " . $STAT["SPD"] . ", " . $STAT["CRIT_DMG"] . ");
             ";
             $q = $this->db->query($s);
             while ($r = $q->fetchArray(SQLITE3_ASSOC)){

application/view/fusion.php

@@ -8,6 +8,7 @@
         <!-- CSS files -->
         <link rel='stylesheet' type='text/css' href='<?=$path["css"]?>ui.css'/>
         <link rel='stylesheet' type='text/css' href='<?=$path["css"]?>fusion.css'/>
+        <link rel='stylesheet' type='text/css' href='<?=$path["css"]?>filters.css'/>
         <!-- Script files -->
         <script src="<?=$path["js"]?>ui.js"></script>
         <!-- Meta tags -->
@@ -70,7 +71,7 @@
 ?>
             <section class='content'>
                 <h2>
-                    <?=$fusion->product->element?> <?=$fusion->product->name?>
+                    <?=$fusion->product->title?>
                 </h2>
                 <article>
                     <div class='f5'>
@@ -101,7 +102,7 @@
                                         $star_class ="star_silver";
                                         $mon_title = $owned->unit->element_name . " " . $owned->unit->name;
                                     }
-                                    elseif ($owned->unit->awakens_from =! "" && $owned->unit->awakens_to == ""){
+                                    elseif ($owned->unit->awakens_from != "" && $owned->unit->awakens_to == ""){
                                         // Already awakened
                                         if ($owned->unit->base_stars - $owned->unit->natural_stars == 1){
                                             // Normal awaken.
@@ -113,7 +114,7 @@
                                         }
                                         $mon_title = $owned->unit->name;
                                     }
-                                    elseif ($owned->unit->awakens_to =! ""){
+                                    elseif ($owned->unit->awakens_to != ""){
                                         // Awakeable.
                                         $star_class ="star_gold";
                                         $mon_title = $owned->unit->element_name . " " . $owned->unit->name;
@@ -204,7 +205,7 @@
                                                     $star_class ="star_silver";
                                                     $mon_title = $owned->unit->element_name . " " . $owned->unit->name;
                                                 }
-                                                elseif ($owned->unit->awakens_from =! "" && $owned->unit->awakens_to == ""){
+                                                elseif ($owned->unit->awakens_from != "" && $owned->unit->awakens_to == ""){
                                                     // Already awakened
                                                     if ($owned->unit->base_stars - $owned->unit->natural_stars == 1){
                                                         // Normal awaken.
@@ -216,7 +217,7 @@
                                                     }
                                                     $mon_title = $owned->unit->name;
                                                 }
-                                                elseif ($owned->unit->awakens_to =! ""){
+                                                elseif ($owned->unit->awakens_to != ""){
                                                     // Awakeable.
                                                     $star_class ="star_gold";
                                                     $mon_title = $owned->unit->element_name . " " . $owned->unit->name;
@@ -307,7 +308,7 @@
                                                                 $star_class ="star_silver";
                                                                 $mon_title = $owned->unit->element_name . " " . $owned->unit->name;
                                                             }
-                                                            elseif ($owned->unit->awakens_from =! "" && $owned->unit->awakens_to == ""){
+                                                            elseif ($owned->unit->awakens_from != "" && $owned->unit->awakens_to == ""){
                                                                 // Already awakened
                                                                 if ($owned->unit->base_stars - $owned->unit->natural_stars == 1){
                                                                     // Normal awaken.
@@ -319,7 +320,7 @@
                                                                 }
                                                                 $mon_title = $owned->unit->name;
                                                             }
-                                                            elseif ($owned->unit->awakens_to =! ""){
+                                                            elseif ($owned->unit->awakens_to != ""){
                                                                 // Awakeable.
                                                                 $star_class ="star_gold";
                                                                 $mon_title = $owned->unit->element_name . " " . $owned->unit->name;
@@ -422,7 +423,7 @@
                                                         $star_class ="star_silver";
                                                         $mon_title = $owned->unit->element_name . " " . $owned->unit->name;
                                                     }
-                                                    elseif ($owned->unit->awakens_from =! "" && $owned->unit->awakens_to == ""){
+                                                    elseif ($owned->unit->awakens_from != "" && $owned->unit->awakens_to == ""){
                                                         // Already awakened
                                                         if ($owned->unit->base_stars - $owned->unit->natural_stars == 1){
                                                             // Normal awaken.
@@ -434,7 +435,7 @@
                                                         }
                                                         $mon_title = $owned->unit->name;
                                                     }
-                                                    elseif ($owned->unit->awakens_to =! ""){
+                                                    elseif ($owned->unit->awakens_to != ""){
                                                         // Awakeable.
                                                         $star_class ="star_gold";
                                                         $mon_title = $owned->unit->element_name . " " . $owned->unit->name;

application/view/inc/filter_runes.php

@@ -0,0 +1,194 @@
+<?php
+    global $RUNE_SET;
+    global $RUNE_STAT;
+?>
+<form action='/runes/' method='get' id='filter_runes' class='filter'>
+    <table>
+        <tr>
+            <td class='filter' rowspan='3'>
+                <span>Type:</span>
+                <select multiple name='type[]' id='filter_type'>
+<?php
+                    foreach($RUNE_SET as $k=>$n){
+                        $selected = "";
+                        if (in_array($n, $filters["type"])){
+                            $selected = "selected='selected'";
+                        }
+                        $name = ucwords(strtolower($k));
+?>
+                        <option value='<?=$n?>' <?=$selected?>><?=$name?></option>
+<?php
+                    }
+?>
+                </select>
+            </td>
+            <td class='filter' rowspan='2'>
+                <span>Slot:</span>
+                <select multiple name='slot[]' id='filter_slot'>
+<?php
+                    for ($i = 0; $i < 6; $i ++){
+                        if (in_array($i, $filters["slot"])){
+                            $selected = "selected='selected'";
+                        }
+                        else{
+                            $selected = "";
+                        }
+?>
+                        <option value='<?=$i?>' <?=$selected?>><?=$i?></option>
+<?php
+                    }
+?>
+                </select>
+            </td>
+            <td class='filter filter_stars' >
+                <span>Min. stars:</span>
+                <input type='number' name='min_stars' id='filter_stars_min' min='1' max='6' value='<?=$filters["min_stars"]?>'/>
+                <span>Max. stars:</span>
+                <input type='number' name='max_stars' id='filter_stars_max' min='1' max='6' value='<?=$filters["max_stars"]?>'/>
+            </td>
+        </tr>
+        <tr>
+            <td class='filter'>
+                <span>Min. level:</span>
+                <input type='number' name='min_level' id='filter_level_min' min='0' max='15' value='<?=$filters["min_level"]?>'/>
+                <span>Max. level:</span>
+                <input type='number' name='max_level' id='filter_level_max' min='0' max='15' value='<?=$filters["max_level"]?>'/>
+            </td>
+        </tr>
+        <tr>
+            <td class='filter'>
+                <span>Main stat:</span>
+                <select multiple name='main_stat[]' id='filter_main_stat'>
+<?php
+                    foreach($RUNE_STAT as $k=>$n){
+                        $selected = "";
+                        if (in_array($n, $filters["main"])){
+                            $selected = "selected='selected'";
+                        }
+                        $name = ucwords($k);
+?>
+                        <option value='<?=$n?>' <?=$selected?>><?=$name?></option>
+<?php
+                    }
+?>
+                    <option value='RES' <?=$selected?>>RES</option>
+                </select>
+            </td>
+            <td class='filter'>
+                <span>Has sub stat:</span>
+                <select multiple name='sub_stat[]' id='filter_sub_stat'>
+<?php
+                    foreach($RUNE_STAT as $k=>$n){
+                        $selected = "";
+                        if (in_array($n, $filters["sub"])){
+                            $selected = "selected='selected'";
+                        }
+                        $name = ucwords($k);
+?>
+                        <option value='<?=$n?>' <?=$selected?>><?=$name?></option>
+<?php
+                    }
+?>
+                </select>
+            </td>
+        </tr>
+        <tr>
+            <td class='filter'>
+                <span>
+                    Assigned:
+                </span>
+<?php
+                $selected = Array("", "", "", "", "");
+                $selected[$filters["assigned"]] = "selected";
+?>
+                <select name='assigned' id='filter_assigned'>
+                    <option value='0' <?=$selected[0]?>>All</option>
+                    <option value='1' <?=$selected[1]?>>Assigned</option>
+                    <option value='2' <?=$selected[2]?>>Unassigned</option>
+                    <option value='3' <?=$selected[3]?>>All (no storage)</option>
+                    <option value='4' <?=$selected[4]?>>Assigned (no storage)</option>
+                </select>
+            </td>
+            <td class='filter'>
+                <span>Min. quality:</span>
+<?php
+                $selected = Array("", "", "", "", "");
+                $selected[$filters["min_quality"]] = "selected";
+?>
+                <select name='min_quality' id='filter_quality_min'>
+                    <option value='0' <?=$selected[0]?>>Normal</option>
+                    <option value='1' <?=$selected[1]?>>Magic</option>
+                    <option value='2' <?=$selected[2]?>>Rare</option>
+                    <option value='3' <?=$selected[3]?>>Hero</option>
+                    <option value='4' <?=$selected[4]?>>Legend</option>
+                </select>
+                <span>Max. quality:</span>
+<?php
+                $selected = Array("", "", "", "", "");
+                $selected[$filters["max_quality"]] = "selected";
+?>
+                <select name='min_quality' id='filter_quality_max'>
+                    <option value='0' <?=$selected[0]?>>Normal</option>
+                    <option value='1' <?=$selected[1]?>>Magic</option>
+                    <option value='2' <?=$selected[2]?>>Rare</option>
+                    <option value='3' <?=$selected[3]?>>Hero</option>
+                    <option value='4' <?=$selected[4]?>>Legend</option>
+                </select>
+            </td>
+            <td class='filter'>
+                <span>Min. original quality:</span>
+<?php
+                $selected = Array("", "", "", "", "");
+                $selected[$filters["min_original_quality"]] = "selected";
+?>
+                <select name='min_quality' id='filter_original_quality_min'>
+                    <option value='0' <?=$selected[0]?>>Normal</option>
+                    <option value='1' <?=$selected[1]?>>Magic</option>
+                    <option value='2' <?=$selected[2]?>>Rare</option>
+                    <option value='3' <?=$selected[3]?>>Hero</option>
+                    <option value='4' <?=$selected[4]?>>Legend</option>
+                </select>
+                <span>Max. original quality:</span>
+<?php
+                $selected = Array("", "", "", "", "");
+                $selected[$filters["max_original_quality"]] = "selected";
+?>
+                <select name='min_quality' id='filter_oriinal_quality_max'>
+                    <option value='0' <?=$selected[0]?>>Normal</option>
+                    <option value='1' <?=$selected[1]?>>Magic</option>
+                    <option value='2' <?=$selected[2]?>>Rare</option>
+                    <option value='3' <?=$selected[3]?>>Hero</option>
+                    <option value='4' <?=$selected[4]?>>Legend</option>
+                </select>
+            </td>
+        </tr>
+        <tr>
+            <td class='filter'>
+                <span>Group by:</span>
+<?php
+                $selected = Array("", "");
+                $selected[$filters["group"]] = "selected";
+?>
+                <select name='group' id='filter_group'>
+                    <option value='0' <?=$selected[0]?>>Slot</option>
+                    <option value='1' <?=$selected[1]?>>Type</option>
+                </select>
+            </td>
+            <td class='filter'>
+                <span>Min. efficiency:</span>
+                <input type='number' name='min_efficiency' id='filter_efficiency_min' min='0' max='100' value='<?=$filters["min_efficiency"]?>'/>%
+                <span>Max. efficiency:</span>
+                <input type='number' name='max_efficiency' id='filter_efficiency_max' min='0' max='100' value='<?=$filters["max_efficiency"]?>'/>%
+            </td>
+            <td class='filter'>
+                <span>Min. maximum efficiency:</span>
+                <input type='number' name='min_max_efficiency' id='filter_max_efficiency_min' min='0' max='100' value='<?=$filters["min_max_efficiency"]?>'/>%
+                <span>Max. maximum efficiency:</span>
+                <input type='number' name='max_max_efficiency' id='filter_max_efficiency_max' min='0' max='100' value='<?=$filters["max_max_efficiency"]?>'/>%
+            </td>
+        </tr>
+    </table>
+    <div id='filter_apply'>
+        <input type='submit' value='Apply'/>
+    </div>
+</form>

application/view/monster_info.php

@@ -1,3 +1,6 @@
+<?php
+    global $ELEMENT;
+?>
 <!DOCTYPE html>
 <html lang='en'>
     <head>
@@ -34,34 +37,15 @@
         include __DIR__ . "/inc/header.php";
         for ($i = 0; $i < 3; $i ++){
             if ($page->monster[$i] != null){
-                if ($i == 0 && $page->monster[1] == null){
-                    // Silver monster.
-                        $star_class ="star_silver";
-                    $mon_title = $page->monster[$i]->element . " " . $page->monster[$i]->name;
-                }
-                elseif ($i == 0 && $page->monster[1] != null){
-                    // Gold monster.
-                    $star_class ="star_gold";
-                    $mon_title = $page->monster[$i]->element . " " . $page->monster[$i]->name;
-                }
-                elseif ($i == 1){
-                    // Awakened monster.
-                        $star_class ="star_purple";
-                    $mon_title = $page->monster[$i]->name;
-                }
-                elseif ($i == 2){
-                    // Second awakened.
-                    $star_class ="star_red";
-                    $mon_title = $page->monster[$i]->name;
-                }
 ?>
                 <section class='content'>
                     <h2>
-                        <?=$mon_title?>
+                        <?=$page->monster[$i]->title?>
+                        <!-- TODO: REWORK
                         <span class='family'>
 <?php
                             //for ($f = 0; $f < 5; $f++){
-                            foreach (Array("Fire", "Water", "Wind", "Light", "Dark") as $element){
+                            foreach (Array($ELEMENT["FIRE"], $ELEMENT["WATER"], $ELEMENT["WIND"], $ELEMENT["LIGHT"], $ELEMENT["DARK"]) as $element){
                                 //$element = array_keys($page->family)[$f];
                                 //$id = $page->family[$f];
                                 $id = $page->family[$element];
@@ -89,21 +73,12 @@
                                 }
                             }
 ?>
-                        </span>
+                        </span>  -->
                     </h2>
                     <article class='stage'>
                         <div class='profile'>
                             <div class='monster_panel'>
-                                <span class='stars'>
-<?php
-                                    for ($j = 0; $j < $page->monster[$i]->base_stars; $j ++){
-?>
-                                        <img class='star <?=$star_class?>' src='<?=$path["img"]["layout"] . "icon/star.png"?>'/>
-<?php
-                                    }
-?>
-                                </span>
-                                <img title='<?=$mon_title?>' class='monster border_<?=$page->monster[$i]->element?>' src='<?=$page->monster[$i]->get_image()?>'/>
+                                <?=html_unit_panel($page->monster[$i])?>
                             </div>
                         </div>
                         <table class='stats'>
@@ -112,7 +87,7 @@
                                     Type
                                 </th>
                                 <th>
-                                    <?=$page->monster[$i]->archetype?>
+                                    <?=$page->monster[$i]->archetype_name?>
                                 </th>
                             </tr>
                             <tr>
@@ -120,7 +95,7 @@
                                     ATK
                                 </th>
                                 <td>
-                                    <?=$page->monster[$i]->base_attack?>
+                                    <?=$page->monster[$i]->attack?>
                                 </td>
                             </tr>
                             <tr>
@@ -128,7 +103,7 @@
                                     DEF
                                 </th>
                                 <td>
-                                    <?=$page->monster[$i]->base_defense?>
+                                    <?=$page->monster[$i]->defense?>
                                 </td>
                             </tr>
                             <tr>
@@ -136,7 +111,7 @@
                                     HP
                                 </th>
                                 <td>
-                                    <?=$page->monster[$i]->base_hp?>
+                                    <?=$page->monster[$i]->hp?>
                                 </td>
                             </tr>
                             <tr>
@@ -184,7 +159,7 @@
 <?php
                             if (count($page->monster[$i]->sources) > 0){
 ?>
-                                <div class='sources'>
+                                <!-- TODO NOT WORKING<div class='sources'>
                                     <span>
                                         Obtainable from:
                                     </span>
@@ -195,7 +170,7 @@
 <?php
                                     }
 ?>
-                                </div>
+                                </div>-->
 <?php
                             }
                             if (count($page->monster[$i]->essences) > 0){

application/view/report_skillup.php

@@ -53,7 +53,7 @@
                 $star_class ="star_silver";
                 $unit_title = $unit->unit->element . " " . $unit->unit->name;
             }
-            elseif ($unit->unit->awakens_from =! "" && $unit->unit->awakens_to == ""){
+            elseif ($unit->unit->awakens_from != "" && $unit->unit->awakens_to == ""){
                 // Already awakened
                 if ($unit->unit->base_stars - $unit->unit->natural_stars == 1){
                     // Normal awaken.
@@ -65,7 +65,7 @@
                 }
                 $unit_title = $unit->unit->name;
             }
-            elseif ($unit->unit->awakens_to =! ""){
+            elseif ($unit->unit->awakens_to != ""){
                 // Awakeable.
                 $star_class = "star_gold";
                 $unit_title = $unit->unit->element . " " . $unit->unit->name;

application/view/runes.php

@@ -52,9 +52,9 @@
                 foreach ($page->runes as $rune){
                     switch ($page->filters["group"]){
                         case "TYPE":
-                            $group = $rune->type;
-                            $group_title = $rune->type;
-                            $group_image = $path["img"]["layout"] . "rune/" .$rune->type . ".png";
+                            $group = $rune->type->name;
+                            $group_title = $rune->type->name;
+                            $group_image = $path["img"]["layout"] . "rune/" .str_pad($rune->type->id, 2, '0', STR_PAD_LEFT) . ".png";
                             break;
                         default:
                             $group = $rune->slot;
@@ -86,342 +86,7 @@
 <?php
                     }
 ?>
-                    <table class='rune'>
-                        <tr>
-                            <td class='icon'>
-                                <div class='rune_panel rune_slot_<?=$rune->slot?> rune_level_<?=$rune->level?> rune_quality_<?=strtolower($rune->quality_name)?> rune_original_quality_<?=strtolower($rune->original_quality)?> rune_legendary_<?=$rune->legendary?>'>
-                                    <img class='rune_base' src='<?=$path["img"]["layout"]?>rune/base.png'/>
-                                    <img class='rune_icon' src='<?=$rune->type->get_image()?>'/>
-                                    <span class='rune_stars'>
-<?php
-                                        for ($i = 0; $i < $rune->stars; $i ++){
-?>
-                                            <img class='star' src='<?=$path["img"]["layout"] . "icon/star.png"?>'/>
-<?php
-                                        }
-?>
-                                    </span>
-                                    <span class='rune_level'>
-                                        <?=$rune->level?>
-                                    </span>
-                                </div>
-<?php
-                                if ($rune->assigned_to != null){
-?>
-                                    <div class='assigned'>
-                                        <a target='blank' href='/monsters/<?=$rune->assigned_to->id?>'>
-                                            <img title='<?=$rune->assigned_to->unit->name?>' class='monster_image border_<?=$rune->assigned_to->unit->element_name?>' src='<?=$rune->assigned_to->unit->get_image()?>'/>
-                                        </a>
-                                    </div>
-<?php
-                                }
-?>
-                            </td>
-                            <td class='stats'>
-                                <table>
-                                    <tr class='main_stat'>
-                                        <td class='stat'>
-<?php
-                                            if (in_array($rune->main_stat_name, array("CRR", "CRD", "RES", "ACC", "HP%", "ATK%", "DEF%"))){
-                                                $stat_name = str_replace("%", "", $rune->main_stat_name);
-                                                $stat_value = $rune->main_stat_value . "%";
-                                            }
-                                            else{
-                                                $stat_name = $rune->main_stat_name;
-                                                $stat_value = $rune->main_stat_value;
-                                            }
-?>
-                                            <?=$stat_name?>
-                                        </td>
-                                        <td class='value'>
-                                            <?=$stat_value?>
-                                        </td>
-                                    </tr>
-                                    <tr class='innate_stat'>
-                                        <td class='stat'>
-<?php
-                                            if (strlen($rune->innate_stat_name) == 0){
-                                                $stat_name = "&nbsp;";
-                                                $stat_value = "";
-                                            }
-                                            elseif (in_array($rune->innate_stat_name, array("CRR", "CRD", "RES", "ACC", "HP%", "ATK%", "DEF%"))){
-                                                $stat_name = str_replace("%", "", $rune->innate_stat_name);
-                                                $stat_value = $rune->innate_stat_value . "%";
-                                            }
-                                            else{
-                                                $stat_name = $rune->innate_stat_name;
-                                                $stat_value = $rune->innate_stat_value;
-                                            }
-?>
-                                            <?=$stat_name?>
-                                        </td>
-                                        <td class='value'>
-                                            <?=$stat_value?>
-                                        </td>
-                                    </tr>
-                                    <tr class=substat>
-                                        <td class='stat'>
-<?php
-                                            if (strlen($rune->substat_1_name) == 0){
-                                                $stat_name = "&nbsp;";
-                                                $stat_value = "";
-                                            }
-                                            elseif (in_array($rune->substat_1_name, array("CRR", "CRD", "RES", "ACC", "HP%", "ATK%", "DEF%"))){
-                                                $stat_name = str_replace("%", "", $rune->substat_1_name);
-                                                $stat_value = $rune->substat_1_value . "%";
-                                            }
-                                            else{
-                                                $stat_name = $rune->substat_1_name;
-                                                $stat_value = $rune->substat_1_value;
-                                            }
-                                            $grind = "";
-                                            if ($rune->substat_1_grind > 0){
-                                                $grind = "+" . $rune->substat_1_grind;
-                                                if (in_array($rune->substat_1_name, array("CRR", "CRD", "RES", "ACC", "HP%", "ATK%", "DEF%"))){
-                                                    $grind = $grind . "%";
-                                                }
-                                            }
-?>
-                                            <?=$stat_name?>
-                                        </td>
-                                        <td class='value'>
-                                            <?=$stat_value?>
-                                            <span class='grind grind_<?=$grind?>'>
-                                                <?=$grind?>
-                                            </span>
-<?php
-                                            if ($rune->substat_1_enchant == 1){
-?>
-                                                <img title='Enchanted' src='<?=$path["img"]["layout"]?>rune/enchanted.png'/>
-<?php
-                                            }
-?>
-                                        </td>
-                                    </tr>
-                                    <tr class=substat>
-                                        <td class='stat'>
-<?php
-                                            if (strlen($rune->substat_2_name) == 0){
-                                                $stat_name = "&nbsp;";
-                                                $stat_value = "";
-                                            }
-                                            elseif (in_array($rune->substat_2_name, array("CRR", "CRD", "RES", "ACC", "HP%", "ATK%", "DEF%"))){
-                                                $stat_name = str_replace("%", "", $rune->substat_2_name);
-                                                $stat_value = $rune->substat_2_value . "%";
-                                            }
-                                            else{
-                                                $stat_name = $rune->substat_2_name;
-                                                $stat_value = $rune->substat_2_value;
-                                            }
-                                            $grind = "";
-                                            if ($rune->substat_2_grind > 0){
-                                                $grind = "+" . $rune->substat_2_grind;
-                                                if (in_array($rune->substat_2_name, array("CRR", "CRD", "RES", "ACC", "HP%", "ATK%", "DEF%"))){
-                                                    $grind = $grind . "%";
-                                                }
-                                            }
-                                            ?>
-                                            <?=$stat_name?>
-                                        </td>
-                                        <td class='value'>
-                                            <?=$stat_value?>
-                                            <span class='grind grind_<?=$grind?>'>
-                                                <?=$grind?>
-                                            </span>
-<?php
-                                            if ($rune->substat_2_enchant == 1){
-?>
-                                                <img title='Enchanted' src='<?=$path["img"]["layout"]?>rune/enchanted.png'/>
-<?php
-                                            }
-?>
-                                        </td>
-                                    </tr>
-                                    <tr class=substat>
-                                        <td class='stat'>
-<?php
-                                            if (strlen($rune->substat_3_name) == 0){
-                                                $stat_name = "&nbsp;";
-                                                $stat_value = "";
-                                            }
-                                            elseif (in_array($rune->substat_3_name, array("CRR", "CRD", "RES", "ACC", "HP%", "ATK%", "DEF%"))){
-                                                $stat_name = str_replace("%", "", $rune->substat_3_name);
-                                                $stat_value = $rune->substat_3_value . "%";
-                                            }
-                                            else{
-                                                $stat_name = $rune->substat_3_name;
-                                                $stat_value = $rune->substat_3_value;
-                                            }
-                                            $grind = "";
-                                            if ($rune->substat_3_grind > 0){
-                                                $grind = "+" . $rune->substat_3_grind;
-                                                if (in_array($rune->substat_3_name, array("CRR", "CRD", "RES", "ACC", "HP%", "ATK%", "DEF%"))){
-                                                    $grind = $grind . "%";
-                                                }
-                                            }
-?>
-                                            <?=$stat_name?>
-                                        </td>
-                                        <td class='value'>
-                                            <?=$stat_value?>
-                                            <span class='grind grind_<?=$grind?>'>
-                                                <?=$grind?>
-                                            </span>
-<?php
-                                            if ($rune->substat_3_enchant == 1){
-?>
-                                                <img title='Enchanted' src='<?=$path["img"]["layout"]?>rune/enchanted.png'/>
-<?php
-                                            }
-?>
-                                        </td>
-                                    </tr>
-                                    <tr class=substat>
-                                        <td class='stat'>
-<?php
-                                            if (strlen($rune->substat_4_name) == 0){
-                                                $stat_name = "&nbsp;";
-                                                $stat_value = "";
-                                            }
-                                            elseif (in_array($rune->substat_4_name, array("CRR", "CRD", "RES", "ACC", "HP%", "ATK%", "DEF%"))){
-                                                $stat_name = str_replace("%", "", $rune->substat_4_name);
-                                                $stat_value = $rune->substat_4_value . "%";
-                                            }
-                                            else{
-                                                $stat_name = $rune->substat_4_name;
-                                                $stat_value = $rune->substat_4_value;
-                                            }
-                                            $grind = "";
-                                            if ($rune->substat_4_grind > 0){
-                                                $grind = "+" . $rune->substat_4_grind;
-                                                if (in_array($rune->substat_4_name, array("CRR", "CRD", "RES", "ACC", "HP%", "ATK%", "DEF%"))){
-                                                    $grind = $grind . "%";
-                                                }
-                                            }
-                                            ?>
-                                            <?=$stat_name?>
-                                        </td>
-                                        <td class='value'>
-                                            <?=$stat_value?>
-                                            <span class='grind grind_<?=$grind?>'>
-                                                <?=$grind?>
-                                            </span>
-<?php
-                                            if ($rune->substat_4_enchant == 1){
-?>
-                                                <img title='Enchanted' src='<?=$path["img"]["layout"]?>rune/enchanted.png'/>
-<?php
-                                            }
-?>
-                                        </td>
-                                    </tr>
-                                </table>
-                            </td>
-                            <td class='details'>
-<?php
-                                switch ($rune->quality){
-                                    case 0:
-                                        $q = "Normal";
-                                        break;
-                                    case 1:
-                                        $q = "Magic";
-                                        break;
-                                    case 2:
-                                        $q = "Rare";
-                                        break;
-                                    case 3:
-                                        $q = "Hero";
-                                        break;
-                                    case 4:
-                                        $q = "Legend";
-                                        break;
-                                }
-                                switch ($rune->original_quality){
-                                    case 0:
-                                        $oq = "Normal";
-                                        break;
-                                    case 1:
-                                        $oq = "Magic";
-                                        break;
-                                    case 2:
-                                        $oq = "Rare";
-                                        break;
-                                    case 3:
-                                        $oq = "Hero";
-                                        break;
-                                    case 4:
-                                        $oq = "Legend";
-                                        break;
-                                }
-?>
-                                <table class='table_details'>
-                                    <tr>
-                                        <td class='title'>
-                                            Quality:
-                                        </td>
-                                        <td class='value'>
-                                            <span class='quality quality_<?=strtolower($q)?>'>
-                                                <?=$q?>
-                                            </span>
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td class='title'>
-                                            Original quality:
-                                        </td>
-                                        <td class='value'>
-                                            <span class='quality quality_<?=strtolower($oq)?>'>
-                                                <?=$oq?>
-                                            </span>
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td class='title'>
-                                            Value:
-                                        </td>
-                                        <td class='value'>
-                                            <?=$rune->value?>
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td class='title'>
-                                            Efficiency:
-                                        </td>
-                                        <td class='value'>
-                                            <?=number_format($rune->efficiency, 2)?>%
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td class='title'>
-                                            Max. efficiency:
-                                        </td>
-                                        <td class='value'>
-                                            <?=number_format($rune->max_efficiency, 2)?>%
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td class='title'>
-                                            Reached efficiency:
-                                        </td>
-                                        <td class='value'>
-<?php
-                                            if ($rune->max_efficiency > 0){
-?>
-                                                <?=number_format($rune->efficiency * 100 / $rune->max_efficiency)?>%
-<?php
-                                            }
-                                            else{
-?>
-                                                0.00%
-<?php
-                                            }
-?>
-                                        </td>
-                                    </tr>
-                                </table>
-                            </td>
-                        </tr>
-                    </table>
+                    <?=html_rune_table($rune, $rune->assigned_to)?>
 <?php
                 }
 ?>

public/css/monster.css

@@ -147,8 +147,9 @@ section#monster article#profile div#skills div.skill span.skill_effects img.effe
 }
 
 section#monster article#profile div#skills div.skill table.skill_up{
-    margin: 0.5em 0 0 0;
+    margin: 0.5em auto 0 auto;
     border-collapse: collapse;
+    font-size: 70%;
 }
 
 section#monster article#profile div#skills div.skill table.skill_up td{

public/css/monster_info.css

@@ -165,7 +165,7 @@ article.stage div.skills div.skill span.skill_effects img.effect_img{
 
 article.stage div.skills div.skill table.skill_up{
     font-size: 70%;
-    margin: 0.5em 0 0 0;
+    margin: 0.5em auto 0 auto;
     border-collapse: collapse;
 }