Addressed some of the pending tasks:

 - Validate email format on email update.
 - Validate current password on password change.
 - Fixes on the new_team action to use the new curernt constant format.
 - Unit entities now don't have information about the attribute or it being a Homunculus.
 - Fixed a crash on guild section when the player is not in a guild.
 - Fixes the run section to use the new curernt constant format.
 - Building information in the unit entities.
 - Storage filters working in the runes page and the skillup report.
 - Can't save teams for easy difficulty unles the area is the Labyrinth.
 - Added Lumel Dimension data.
 - Not fixing data validation in API php scripts (python scrits do validate).

application/Constant.php

@@ -457,6 +457,21 @@
          */
         const KARZHAN_REMAINS_INUGAMI = 2202;
 
+        /**
+         * Cliff of Tough Beast Men.
+         */
+        const CLIFF_OF_TOUGH_BEASTS_MEN = 3101;
+
+        /**
+         * Lumel Remains (Werewolf).
+         */
+        const LUMEL_REMAINS_WEREWOLF = 3201;
+
+        /**
+         * Lumel Remains (Martial Cat).
+         */
+        const KARZHAN_REMAINS_MARTIAL_CAT = 3202;
+
         /**
          * Hall of water.
          */
@@ -491,7 +506,6 @@
          * Dragons Lair.
          */
         const DRAGONS_LAIR = 9001;
-        // TODO: Lumel
     };
 
     /**

application/action/edit_profile.php

@@ -31,31 +31,40 @@
 
         if (filter_input(INPUT_POST, "mail")){
             $mail = filter_input(INPUT_POST, 'mail');
-            // TODO: Validate mail
+            if (!filter_var($mail, FILTER_VALIDATE_EMAIL)){
+                return -1;
+            }
             $s = $db->prepare('UPDATE player SET mail = :mail WHERE uid = :uid;');
             $s->bindValue(':uid', $player);
             $s->bindValue(':mail', $mail);
             if(!$s->execute()){
-                return -1;
+                return -2;
             }
         }
 
         if (filter_input(INPUT_POST, "pass")){
             $pass = sha1(filter_input(INPUT_POST, 'pass'));
             $currentPass = sha1(filter_input(INPUT_POST, 'currentPass'));
-            // TODO: Validate current
+            $s = $db->prepare('SELECT COUNT(uid) AS count FROM player WHERE uid = :uid AND password = :currentPass;');
+            $s->bindValue(':uid', $player);
+            $s->bindValue(':currentPass', $currentPass);
+            $q = $s->execute();
+            $r = $q->fetchArray(SQLITE3_ASSOC);
+            if ($r["count"] != 1){
+                return -3;
+            }
             $s = $db->prepare('UPDATE player SET password = :pass WHERE uid = :uid AND password = :currentPass;');
             $s->bindValue(':uid', $player);
             $s->bindValue(':pass', $mail);
             $s->bindValue(':currentPass', $currentPass);
             if(!$s->execute()){
-                return -2;
+                return -4;
             }
         }
 
         if (filter_input(INPUT_POST, "api")){
             $characters = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
-            $charactersLength =16;
+            $charactersLength = 16;
             $api = '';
             for ($i = 0; $i < $length; $i++) {
                 $api .= $characters[rand(0, $charactersLength - 1)];
@@ -64,7 +73,7 @@
             $s->bindValue(':uid', $player);
             $s->bindValue(':api', $api);
             if(!$s->execute()){
-                return -3;
+                return -5;
             }
             $response = $api;
         }

application/action/new_team.php

@@ -8,8 +8,6 @@
      * @category Action
      */
 
-    // TODO: Replace in_array for property_exists
-
     /**
      * Logs the user out and redirects to the login page.
      *
@@ -35,12 +33,7 @@
      * @global int[] Labyrinth stage types.
      */
     function action($db = null){
-        global $SCENARIO;
-        global $DUNGEON;
-        global $ELEMENTAL_RIFT_DUNGEON;
-        global $LABYRINTH_STAGES;
 
-        //$player = SQLite3::escapeString($_POST["uid"]);
         $player = filter_input(INPUT_POST, 'uid');
         $area_type = filter_input(INPUT_POST, 'area_type');
         $area = filter_input(INPUT_POST, 'area');
@@ -59,13 +52,13 @@
                 if ($stage < 0 || $stage > 7){
                     return -31;
                 }
-                if (!($difficulty == 0 || in_array($difficulty, $DIFFICULTY) || $difficulty == DIFFICULTY::EASY)){
+                if (!($difficulty == 0 || property_exists(DIFFICULTY_ID, $difficulty) || $difficulty == DIFFICULTY::EASY)){
                     return -32;
                 }
                 if ($id_count < 1 || $id_count > 4){
                     return -33;
                 }
-                if (!in_array($area, $SCENARIO)){
+                if (!property_exists(SCENARIO_ID, $area)){
                     return -34;
                 }
                 break;
@@ -77,7 +70,7 @@
                 if ($id_count < 1 || $id_count > 5){
                     return -36;
                 }
-                if (!in_array($area, $DUNGEON)){
+                if (!property_exists(DUNGEON_ID, $area)){
                     return -37;
                 }
                 break;
@@ -87,7 +80,7 @@
                 if ($id_count < 1 || $id_count > 6){
                     return -39;
                 }
-                if (!in_array($area, $ELEMENTAL_RIFT_DUNGEON)){
+                if (!property_exists(ELEMENTAL_RIFT_DUNGEON_ID, $area)){
                     return -40;
                 }
                 break;
@@ -118,13 +111,13 @@
                 break;
             case AREA_TYPE::TARTARUS_LABYRINTH:
                 $stage = null;
-                if ($difficulty < 0 || !in_array($difficulty, $DIFFICULTY)){
+                if ($difficulty < 0 || !property_exists(DIFFICULTY_ID, $difficulty)){
                     return -43;
                 }
                 if ($id_count < 1 || $id_count > 5){
                     return -44;
                 }
-                if (!in_array($area, $LABYRINTH_STAGES)){
+                if (!property_exists(LABYRINTH_STAGES_ID, $area)){
                     return -45;
                 }
                 break;
@@ -146,7 +139,7 @@
                 if ($id_count < 1 || $id_count > 4){
                     return -49;
                 }
-                if (!in_array($area, $DUNGEON)){
+                if (!property_exists(DUNGEON_ID, $area)){
                     return -50;
                 }
                 break;

application/bin/log-profile.py

@@ -358,15 +358,13 @@ def parseUnits(db, data):
         exp_gained = mon["exp_gained"]
         exp_gain_rate = mon["exp_gain_rate"]
         costume = mon["costume_master_id"]
-        attribute = mon["attribute"]
         source = mon["source"]
         create_time = mon["create_time"]
-        homunculus = mon["homunculus"]
         homunculus_name = mon["homunculus_name"]
         lock = 0
         if id in lock_list:
             lock = 1
-        insert(db, "unit", (uid, id, building, monster, level, stars, hp, attack, defense, speed, crit_rate, crit_damage, resistance, accuracy, experience, exp_gained, exp_gain_rate, costume, attribute, source, create_time, homunculus, homunculus_name, lock))
+        insert(db, "unit", (uid, id, building, monster, level, stars, hp, attack, defense, speed, crit_rate, crit_damage, resistance, accuracy, experience, exp_gained, exp_gain_rate, costume, source, create_time, homunculus_name, lock))
         for skill in mon["skills"]:
             skill_id = skill[0]
             skill_level = skill[1]
@@ -1012,6 +1010,9 @@ Parses guild data (tables guild, guild_member).
 """
 def parseGuild(db, data):
     print("Parsing guild...")
+    if (data["guild"]["guild_info"] == None):
+        # No guild
+        return
     if len(data["guild"]["guild_info"]) < 1:
         return
     guild = data["guild"]["guild_info"]

application/entity/Run.php

@@ -7,8 +7,6 @@
      * @category Entity
      */
 
-     // TODO: Replace in_array for property_exists
-
     /**
      * Require dependent entities if not present.
      */
@@ -164,16 +162,16 @@
             $this->uid = $r["uid"];
             $this->dtime = $r["dtime"];
             $type = 0;
-            if (in_array($r["area"], $RAID_RIFT_DUNGEON) && $r["stage"] < 1){
+            if (property_exists(RAID_RIFT_DUNGEON_ID, $r["area"]) && $r["stage"] < 1){
                 $type = AREA_TYPE::RIFT_RAID_DUNGEON;
             }
-            elseif (in_array($r["area"], $SCENARIO)){
+            elseif (property_exists(SCENARIO_ID, $r["area"])){
                 $type = AREA_TYPE::SCENARIO;
             }
-            elseif (in_array($r["area"], $ELEMENTAL_RIFT_DUNGEON) && $r["stage"] < 1){
+            elseif (property_exists(ELEMENTAL_RIFT_DUNGEON_ID, $r["area"]) && $r["stage"] < 1){
                 $type = AREA_TYPE::ELEMENTAL_RIFT_DUNGEON;
             }
-            elseif (in_array($r["area"], $DUNGEON)){
+            elseif (property_exists(DUNGEON_ID, $r["area"])){
                 $type = AREA_TYPE::CAIROS_DUNGEON;
             }
             $this->area = new K_Area($this->db, $r["area"], $type);

application/entity/Unit.php

@@ -14,6 +14,7 @@
     require_once(PATH::ENTITY . "K_Unit.php");
     require_once(PATH::ENTITY . "Team.php");
     require_once(PATH::ENTITY . "Rune.php");
+    require_once(PATH::ENTITY . "Building.php");
 
     /**
      * A Unit.
@@ -114,11 +115,6 @@
          */
         public $costume;
 
-        /**
-         * @var int Unit attribute
-         */
-        public $attribute;
-
         /**
          * @var K_Source Source the unit was aquired from.
          */
@@ -129,11 +125,6 @@
          */
         public $create_time;
 
-        /**
-         * @var bool Indicates if the unit is a Homunculus
-         */
-        public $homunculus;
-
         /**
          * @var string Indicates the Homunculus name
          */
@@ -277,7 +268,7 @@
             $this->uid = $r["uid"];
             $this->id = $r["id"];
             if (strlen($r["building"]) > 0){
-                // TODO Entity $this->monster = new Building($this->db, $r["building"]);
+                $this->building = new Building($this->db, $r["building"]);
             }
             if (strlen($r["unit"]) > 0){
                 $this->unit = new K_Unit($this->db, $r["unit"], $complete);
@@ -295,18 +286,10 @@
             $this->experience = $r["experience"];
             $this->exp_gained = $r["exp_gained"];
             $this->exp_gain_rate = $r["exp_gain_rate"];
-            $this->costume = $r["costume"]; // TODO: Create entities?
-            $this->attribute = $r["attribute"];
-            $this->source = new K_Source($this->db, $r["source"]); // TODO: Instantiate?
+            $this->costume = $r["costume"];
+            $this->source = new K_Source($this->db, $r["source"]);
             $this->create_time = date_create($r["create_time"]);
-            $this->homunculus = $r["homunculus"];
             $this->homunculus_name = $r["homunculus_name"];
-            #$this->avg_rune_efficiency = $r["avg_rune_efficiency"];
-            #$this->fodder = $r["fodder"];
-            #$this->in_storage = $r["in_storage"];
-            #$this->ignore_for_fusion = $r["ignore_for_fusion"];
-            #$this->priority = $r["priority"];
-            #$this->notes = $r["notes"];
             if ($complete){
                 $this->load_runes();
                 $this->load_teams();

application/page/Guild_Page.php

@@ -48,7 +48,6 @@
               FROM guild
               WHERE id = (SELECT guild FROM guild_member WHERE id = '$UID');
             ";
-            // TODO: Where guild.member.player = ...
             $q = $this->db->query($s);
             $r = $q->fetchArray(SQLITE3_ASSOC);
             if ($r){

application/page/Report_Skillup_Page.php

@@ -135,8 +135,7 @@
                 ;
             }
             if (!$this->filters["in_storage"]){
-                // TODO
-                //$s = $s . " AND unit.in_storage = 0 ";
+                $s = $s . " AND unit.in_storage = 0 ";
             }
             if (!$this->filters["without_runes"]){
                 $s = $s . " AND unit.id IN (SELECT DISTINCT assigned_to FROM rune) ";

application/page/Runes_Page.php

@@ -26,7 +26,7 @@
         /**
          * @var \Rune[] Runes to show.
          *
-         * NOTE: In this case, the monster member is not the id, but a monster
+         * In this case, the monster member is not the id, but a monster
          * instance.
          */
         public $runes = [];
@@ -237,11 +237,10 @@
                     $s = $s . " AND assigned_to IS NULL ";
                     break;
                 case 3:
-                    // TODO
-                    //$s = $s . " AND (assigned_to IS NULL OR assigned_to IN (SELECT DISTINCT id FROM unit WHERE in_storage = 0)) ";
+                    $s = $s . " AND (assigned_to IS NULL OR assigned_to IN (SELECT DISTINCT id FROM unit WHERE in_storage = 0)) ";
                     break;
                 case 4:
-                    //$s = $s . " AND assigned_to IN (SELECT DISTINCT id FROM unit WHERE in_storage = 0) ";
+                    $s = $s . " AND assigned_to IN (SELECT DISTINCT id FROM unit WHERE in_storage = 0) ";
                     break;
             }
             $s = $s . " ORDER BY ";

application/view/runs.php

@@ -154,12 +154,17 @@
                                         <span class='stage'><?=$run->stage?></span>
 <?php
                                     }
-                                    // TODO: Labyrinth difficulty
                                     if(property_exists(SCENARIO_ID, $run->area->id)){
 ?>
                                         <span class='difficulty'>
 <?php
-                                            for ($i = 0; $i < $run->difficulty; $i ++){
+                                            if ($run->area->type == AREA_TYPE_ID::TARTARUS_LABYRINTH){
+                                                $difficulty = $run->difficulty;
+                                            }
+                                            else{
+                                                $difficulty = $run->difficulty - 1;
+                                            }
+                                            for ($i = 0; $i < $difficulty; $i ++){
 ?>
                                                 <img class='difficulty' src='<?=URL::IMG["ICON"]?>star.png'/>
 <?php

application/view/teams.php

@@ -195,6 +195,8 @@
                 var level = null;
                 var image = null;
                 var element = null;
+                var awakens_from = null;
+                var awakens_to = null;
                 for (var i = 0; i < units.length; i ++) {
                     if (units[i].id == id){
                         name = units[i].name;