From 4bc6f023f18a3e8d95102492054365c1e1785b8f Mon Sep 17 00:00:00 2001
From: Maru <matheus@itsmaru.com>
Date: Thu, 28 Sep 2017 17:35:07 -0300
Subject: [PATCH] Merge

---
 src/servers/Server_Common/Common.h            | 23 +++++++++++++++++++
 src/servers/Server_Common/Exd/ExdData.cpp     | 13 +++++++++++
 .../DebugCommand/DebugCommandHandler.cpp      | 22 ++----------------
 3 files changed, 38 insertions(+), 20 deletions(-)

diff --git a/src/servers/Server_Common/Common.h b/src/servers/Server_Common/Common.h
index 62271360..a2a243be 100644
--- a/src/servers/Server_Common/Common.h
+++ b/src/servers/Server_Common/Common.h
@@ -383,6 +383,29 @@ namespace Core {
          instance,
       };
 
+      enum TerritoryIntendedUseType : uint8_t //ToDo: Add The Rest of The Territory Types and Have Better Names For Them
+      {
+         Town = 0,
+         OpenWorld = 1,
+         Inn = 2,
+         Dungeon = 3,
+         JailArea = 5,
+         OpeningArea = 6,
+         BeforeTrialDung = 7,
+         AllianceRaid = 8,
+         OpenWorldInstanceBattle = 9,
+         Trial = 10,
+         HousingArea = 13,
+         HousingPrivateArea = 14,
+         MSQPrivateArea = 15,
+         Raids = 16,
+         RaidFights = 17,
+         ChocoboTutorial = 21,
+         Wedding = 22,
+         BeginnerTutorial = 27,
+         PalaceOfTheDead = 31,
+      };
+
       enum CharaLook : uint8_t
       {
          Race = 0x00,
diff --git a/src/servers/Server_Common/Exd/ExdData.cpp b/src/servers/Server_Common/Exd/ExdData.cpp
index eebb4fab..17007e55 100644
--- a/src/servers/Server_Common/Exd/ExdData.cpp
+++ b/src/servers/Server_Common/Exd/ExdData.cpp
@@ -345,6 +345,7 @@ bool Core::Data::ExdData::loadActionInfo()
       uint8_t points_type       = getField< uint8_t >( fields, 30 );     // 30
       uint16_t points_cost      = getField< uint16_t >( fields, 31 );    // 31
 
+<<<<<<< HEAD
       bool is_instant           = getField< bool >( fields, 35 );        // 35
       uint16_t cast_time        = getField< uint16_t >( fields, 36 );    // 36
       uint16_t recast_time      = getField< uint16_t >( fields, 37 );    // 37
@@ -356,6 +357,18 @@ bool Core::Data::ExdData::loadActionInfo()
       info->id                  = id;
       info->name                = name;
       info->category            = category;
+=======
+      bool is_instant = getField< bool >( fields, 35 );       // 35
+      uint16_t cast_time = getField< uint16_t >( fields, 36 );    // 36
+      uint16_t recast_time = getField< uint16_t >( fields, 37 );  // 37
+
+      int8_t model = getField< int8_t >( fields, 39 );            // 39: Action model
+      uint8_t aspect = getField< uint8_t >( fields, 40 );         // 40: Action aspect
+
+      info->id = id;
+      info->name = name;
+      info->category = category;
+>>>>>>> 08f4c7651fafdaf8f4d98868a94ab4688eb71379
 
       info->class_job           = class_job;
       info->unlock_level        = unlock_level;
diff --git a/src/servers/Server_Zone/DebugCommand/DebugCommandHandler.cpp b/src/servers/Server_Zone/DebugCommand/DebugCommandHandler.cpp
index 6a4f6e84..b3137453 100644
--- a/src/servers/Server_Zone/DebugCommand/DebugCommandHandler.cpp
+++ b/src/servers/Server_Zone/DebugCommand/DebugCommandHandler.cpp
@@ -239,25 +239,6 @@ void Core::DebugCommandHandler::set( char * data, Core::Entity::PlayerPtr pPlaye
        else
            pPlayer->setClassJob( static_cast<Core::Common::ClassJob> ( id ) );
    }
-   else if( subCommand == "no" )
-   {
-      int32_t id;
-
-      sscanf( params.c_str(), "%d", &id );
-
-      uint8_t typeshift = 0x6;
-      uint8_t mask = 1 << typeshift;
-      id &= mask;
-      bool final = ( id & mask ) == mask;
-      pPlayer->sendDebug( std::to_string(final) );
-   }
-   else if( subCommand == "aaah" )
-   {
-      int32_t id;
-      sscanf( params.c_str(), "%d", &id );
-      
-      pPlayer->sendDebug( std::to_string( pPlayer->actionHasCastTime( id ) ) );
-   }
    else if ( subCommand == "cfpenalty" )
    {
       int32_t minutes;
@@ -486,6 +467,7 @@ void Core::DebugCommandHandler::nudge( char * data, Entity::PlayerPtr pPlayer, b
 
 void Core::DebugCommandHandler::serverInfo( char * data, Core::Entity::PlayerPtr pPlayer, boost::shared_ptr< Core::DebugCommand > command )
 {
-   pPlayer->sendDebug( "SapphireServer " + Version::VERSION + " - " + Version::GIT_HASH );
+   pPlayer->sendDebug( "SapphireServer " + Version::VERSION + "\nRev: " + Version::GIT_HASH );
+   pPlayer->sendDebug( "Compiled: " __DATE__ " " __TIME__ );
    pPlayer->sendDebug( "Sessions: " + std::to_string( g_serverZone.getSessionCount() ) );
 }