Renaming power to param;

Removing unknown property as argument from the script and GameCommandHandler method;

bin/scripts/chai/skill/skillDef_3.chai

@@ -10,7 +10,7 @@ class skillDef_3Def
 
     def onFinish( player, target )
     {
-        player.addStatusEffectById(50, 20000, 30, 65505);
+        player.addStatusEffectById(50, 20000, 30);
     }
 
 };

src/servers/Server_Common/ServerPacketDef.h

@@ -339,8 +339,8 @@ struct FFXIVIpcAddStatusEffect : FFXIVIpcBasePacket<AddStatusEffect>
    uint8_t effect_index; // which position do i display this
    uint8_t unknown3;
    uint16_t effect_id;
-   uint16_t unkpower1;
+   uint16_t param;
-   uint16_t unkpower2;
+   uint16_t unknown5;    // Sort this out (old right half of power/param property)
    float duration;
    uint32_t actor_id1;
    uint8_t unknown4[52];

src/servers/Server_Zone/Actor.cpp

@@ -605,11 +605,10 @@ void Core::Entity::Actor::addStatusEffect( StatusEffect::StatusEffectPtr pEffect
 }
 
 /*! \param StatusEffectPtr to be applied to the actor */
-void Core::Entity::Actor::addStatusEffectById( int32_t id, int32_t duration, uint16_t power, uint16_t power_2 )
+void Core::Entity::Actor::addStatusEffectById( int32_t id, int32_t duration, uint16_t param )
 {
    StatusEffect::StatusEffectPtr effect( new StatusEffect::StatusEffect( id, shared_from_this(), shared_from_this(), duration, 3000 ) );
-   effect->setPower( power );
+   effect->setParam( param );
-   effect->setPower_2( power_2 );
    addStatusEffect( effect );
 }
 

src/servers/Server_Zone/Actor.h

@@ -290,7 +290,7 @@ public:
    void addStatusEffect( StatusEffect::StatusEffectPtr pEffect );
 
    // add a status effect by id
-   void addStatusEffectById( int32_t id, int32_t duration, uint16_t power = 0, uint16_t power_2 = 0 );
+   void addStatusEffectById( int32_t id, int32_t duration, uint16_t param = 0 );
 
    // TODO: Why did i even declare them publicly here?!
    std::set< ActorPtr >            m_inRangeActors;

src/servers/Server_Zone/GameCommandHandler.cpp

@@ -363,15 +363,13 @@ void Core::GameCommandHandler::add( char * data, Core::Entity::PlayerPtr pPlayer
    {
       int32_t id;
       int32_t duration;
-      uint16_t power;
+      uint16_t param;
 
-      uint16_t power_2;
+      sscanf( params.c_str(), "%d %d %hd", &id, &duration, &param );
-
-      sscanf( params.c_str(), "%d %d %hd %hd", &id, &duration, &power, &power_2 );
 
       StatusEffect::StatusEffectPtr effect( new StatusEffect::StatusEffect( id, pPlayer, pPlayer, duration, 3000 ) );
-      effect->setPower( power );
+      effect->setParam( param );
-      effect->setPower_2( power_2 );
+
       pPlayer->addStatusEffect( effect );
    }
    else if( subCommand == "spawn" )

src/servers/Server_Zone/StatusEffect.cpp

@@ -67,14 +67,9 @@ uint32_t Core::StatusEffect::StatusEffect::getTargetActorId() const
    return m_targetActor->getId();
 }
 
-uint16_t Core::StatusEffect::StatusEffect::getPower() const
+uint16_t Core::StatusEffect::StatusEffect::getParam() const
 {
-   return m_unkpower1;
+   return m_param;
-}
-
-uint16_t Core::StatusEffect::StatusEffect::getPower_2() const
-{
-   return m_unkpower2;
 }
 
 void Core::StatusEffect::StatusEffect::applyStatus()
@@ -139,14 +134,9 @@ void Core::StatusEffect::StatusEffect::setLastTick( uint64_t lastTick )
    m_lastTick = lastTick;
 }
 
-void Core::StatusEffect::StatusEffect::setPower( uint16_t power )
+void Core::StatusEffect::StatusEffect::setParam( uint16_t param )
 {
-   m_unkpower1 = power;
+   m_param = param;
-}
-
-void Core::StatusEffect::StatusEffect::setPower_2( uint16_t power )
-{
-   m_unkpower2 = power;
 }
 
 const std::string& Core::StatusEffect::StatusEffect::getName() const

src/servers/Server_Zone/StatusEffect.h

@@ -30,11 +30,9 @@ public:
    uint32_t getTargetActorId() const;
    uint64_t getLastTickMs() const;
    uint64_t getStartTimeMs() const;
-   uint16_t getPower() const;
+   uint16_t getParam() const;
-   uint16_t getPower_2() const;
    void setLastTick( uint64_t lastTick );
-   void setPower( uint16_t power );
+   void setParam( uint16_t param );
-   void setPower_2( uint16_t power );
    const std::string& getName() const;
 
 private:
@@ -45,8 +43,7 @@ private:
    uint64_t m_startTime;
    uint32_t m_tickRate;
    uint64_t m_lastTick;
-   uint16_t m_unkpower1;
+   uint16_t m_param;
-   uint16_t m_unkpower2;  //Figure out what this actually is supposed to be
    std::string m_name;
 
 };

src/servers/Server_Zone/StatusEffectContainer.cpp

@@ -69,8 +69,7 @@ void Core::StatusEffect::StatusEffectContainer::addStatusEffect( StatusEffectPtr
    statusEffectAdd.data().max_mp = m_pOwner->getMaxMp();
    statusEffectAdd.data().max_something = 1;
     //statusEffectAdd.data().unknown2 = 28;
-   statusEffectAdd.data().unkpower1 = pEffect->getPower();
+   statusEffectAdd.data().param = pEffect->getParam();
-   statusEffectAdd.data().unkpower2 = pEffect->getPower_2();
 
    bool sendToSelf = m_pOwner->isPlayer() ? true : false;
    m_pOwner->sendToInRangeSet( statusEffectAdd, sendToSelf );