Fixed homunculus score in skillup report. Propper star color for SFV collab units, Devilmon and Rainbowmons. Labels in badges.

application/entity/K_Unit.php

@@ -348,8 +348,9 @@
                 $this->load_sources();
                 $this->load_transformation();
             }
-            // No to, no from. Silver unit.
+            // Guess monster name
             if ($this->awakens_from == "" && $this->awakens_to == ""){
+                // No to, no from. Silver unit.
                 if ($this->base_stars >= 4){
                     // SFV Collab event units, always awakened.
                     $this->title = $this->name;

application/helper/HTML_Helper.php

@@ -73,12 +73,7 @@
             }
             $html = "";
             if ($k->awakens_from == "" && $k->awakens_to == ""){
-                if ($k->name == "Devilmon"){
-                    error_log("DBG DEVILMON:");
-                    error_log("ARCHETYPE: " . $k->archetype . "(" . ARCHETYPE_ID::MATERIAL . ")");
-                    error_log("ELEMENT: " . $k->element . "(" . ELEMENT_ID::DARK . ")");
-                }
-                // No to, no from, silver monster.
+                // No to, no from
                 if ($k->base_stars >= 4){
                     // SFV Collab event units, always awakened.
                     $star_class = "star_purple";

application/page/Report_Skillup_Page.php

@@ -111,10 +111,35 @@
               WHERE
                 unit.uid = '$UID' AND
                 unit.unit = k_unit.id AND
-                unit_skill.unit = unit.id AND
-                --unit_skill.skill = k_unit_skill.skill AND
-                k_unit.id = k_unit_skill.unit AND
-                k_skill.id = k_unit_skill.skill AND
+                unit_skill.unit = unit.id AND ";
+            if (!$this->filters["HOMUNCULUS"]){
+                $s .= "
+                  k_unit.homunculus <> 1 AND 
+                  unit_skill.skill = k_unit_skill.skill AND
+                  k_unit.id = k_unit_skill.unit AND
+                  k_skill.id = k_unit_skill.skill AND
+                  ";
+              }
+              else{
+                $s .= "
+                  (
+                    (
+                      k_unit.homunculus <> 1 AND 
+                      unit_skill.skill = k_unit_skill.skill AND
+                      k_unit.id = k_unit_skill.unit AND
+                      k_skill.id = k_unit_skill.skill
+                    ) OR
+                    (
+                      unit.homunculus = 1 AND 
+                      unit.unit = k_unit.id AND
+                      unit_skill.unit = unit.id AND
+                      unit_skill.skill = k_skill.id AND
+                      unit.id = unit_skill.unit
+                    )
+                  ) AND
+                  ";
+              }
+              $s .= "
                 k_skill.max_level > 1 AND
                 unit.stars >= " . $this->filters["MIN_STARS"] . " AND
                 unit.stars <= " . $this->filters["MAX_STARS"]
@@ -152,9 +177,6 @@
                     $s = $s . " AND k_unit.id <> 23015 AND k_unit.id <> 23005 ";
                 }
             }
-            if (!$this->filters["HOMUNCULUS"]){
-                $s = $s . " AND k_unit.homunculus <> 1 ";
-            }
             $s = $s .
               "GROUP BY unit.id ";
             if (!$this->filters["MAXED"]){
@@ -162,12 +184,13 @@
             }
             $s = $s . "
               ORDER BY
-                CAST(ponderated_lvl AS FLOAT) / CAST(ponderated_max_lvl AS FLOAT),
+                CAST(ponderated_lvl * 100 AS FLOAT) / CAST(ponderated_max_lvl * 100 AS FLOAT),
                 unit.stars DESC,
                 unit.level DESC,
                 CAST(lvl AS FLOAT) / CAST(max_lvl AS FLOAT),
-                max_lvl - lvl DESC;
+                max_lvl - lvl DESC
             ";
+            error_log($s);
             return $s;
         }
     }

public/css/ui.css

@@ -654,7 +654,7 @@ div.monster_panel span.badges{
     bottom: 0.6em;
     left: 0.1em;
     z-index: 1;
-    pointer-events: none;
+    /* pointer-events: none; */
     display: block;
     transform: rotate(180deg);
 }