mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-04-24 21:57:44 +00:00
Code Activity

Renaming power to param;

Browse source 
Removing unknown property as argument from the script and GameCommandHandler method;
This commit is contained in:
Maru 2017-08-12 22:36:52 -03:00
parent f124b5eac4
commit 4f14f44b0d
8 changed files with 18 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bin/scripts/chai/skill/skillDef_3.chai
View file

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

4
src/servers/Server_Common/ServerPacketDef.h
View file

@ -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 unkpower2;
uint16_t param;
uint16_t unknown5; // Sort this out (old right half of power/param property)
float duration;
uint32_t actor_id1;
uint8_t unknown4[52];

5
src/servers/Server_Zone/Actor.cpp
View file

@ -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->setPower_2( power_2 );
effect->setParam( param );
addStatusEffect( effect );
}

2
src/servers/Server_Zone/Actor.h
View file

@ -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;

10
src/servers/Server_Zone/GameCommandHandler.cpp
View file

@ -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 %hd", &id, &duration, &power, &power_2 );
sscanf( params.c_str(), "%d %d %hd", &id, &duration, &param );
StatusEffect::StatusEffectPtr effect( new StatusEffect::StatusEffect( id, pPlayer, pPlayer, duration, 3000 ) );
effect->setPower( power );
effect->setPower_2( power_2 );
effect->setParam( param );
pPlayer->addStatusEffect( effect );
}
else if( subCommand == "spawn" )

18
src/servers/Server_Zone/StatusEffect.cpp
View file

@ -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;
}
uint16_t Core::StatusEffect::StatusEffect::getPower_2() const
{
return m_unkpower2;
return m_param;
}
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;
}
void Core::StatusEffect::StatusEffect::setPower_2( uint16_t power )
{
m_unkpower2 = power;
m_param = param;
}
const std::string& Core::StatusEffect::StatusEffect::getName() const

9
src/servers/Server_Zone/StatusEffect.h
View file

@ -30,11 +30,9 @@ public:
uint32_t getTargetActorId() const;
uint64_t getLastTickMs() const;
uint64_t getStartTimeMs() const;
uint16_t getPower() const;
uint16_t getPower_2() const;
uint16_t getParam() const;
void setLastTick( uint64_t lastTick );
void setPower( uint16_t power );
void setPower_2( uint16_t power );
void setParam( uint16_t param );
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_unkpower2; //Figure out what this actually is supposed to be
uint16_t m_param;
std::string m_name;
};

3
src/servers/Server_Zone/StatusEffectContainer.cpp
View file

@ -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().unkpower2 = pEffect->getPower_2();
statusEffectAdd.data().param = pEffect->getParam();
bool sendToSelf = m_pOwner->isPlayer() ? true : false;
m_pOwner->sendToInRangeSet( statusEffectAdd, sendToSelf );