diff --git a/scripts/chai/skill/cnj/skillDef_121.chai b/scripts/chai/skill/cnj/skillDef_121.chai index a3d56093..19749681 100644 --- a/scripts/chai/skill/cnj/skillDef_121.chai +++ b/scripts/chai/skill/cnj/skillDef_121.chai @@ -10,7 +10,7 @@ class skillDef_121Def def onFinish( player, target ) { - player.handleScriptSkill( STD_DAMAGE, 121, 5, 0, target ); + player.handleScriptSkill( STD_DAMAGE, 121, 50, 0, target ); target.addStatusEffectByIdIfNotExist(143, 20000, 0); } diff --git a/scripts/chai/skill/cnj/skillDef_132.chai b/scripts/chai/skill/cnj/skillDef_132.chai new file mode 100644 index 00000000..765f82a1 --- /dev/null +++ b/scripts/chai/skill/cnj/skillDef_132.chai @@ -0,0 +1,19 @@ +// Skill Name: Aero II +// Skill ID: 132 + +class skillDef_132Def +{ + def skillDef_132Def() + { + + } + + def onFinish( player, target ) + { + player.handleScriptSkill( STD_DAMAGE, 132, 50, 0, target ); + target.addStatusEffectByIdIfNotExist( 143, 20000, 0 ); + } + +}; + +GLOBAL skillDef_132 = skillDef_132Def(); diff --git a/scripts/chai/status/statusDef_143.chai b/scripts/chai/status/statusDef_143.chai index e797ef37..70a4d80a 100644 --- a/scripts/chai/status/statusDef_143.chai +++ b/scripts/chai/status/statusDef_143.chai @@ -1,4 +1,4 @@ -// Status Name: Wind +// Status Name: Aero // Status ID: 143 class statusDef_143Def diff --git a/scripts/chai/status/statusDef_144.chai b/scripts/chai/status/statusDef_144.chai new file mode 100644 index 00000000..72159c8d --- /dev/null +++ b/scripts/chai/status/statusDef_144.chai @@ -0,0 +1,18 @@ +// Status Name: Aero II +// Status ID: 144 + +class statusDef_144Def +{ + def statusDef_144Def() + { + + } + + def onTick( actor, effect ) + { + effect.registerTickEffect( 1, 50 ); + } + +}; + +GLOBAL statusDef_144 = statusDef_144Def(); diff --git a/src/servers/Server_Zone/Action/ActionCast.cpp b/src/servers/Server_Zone/Action/ActionCast.cpp index 5c25d16e..a3297484 100644 --- a/src/servers/Server_Zone/Action/ActionCast.cpp +++ b/src/servers/Server_Zone/Action/ActionCast.cpp @@ -56,7 +56,7 @@ void Core::Action::ActionCast::onStart() castPacket.data().cast_time = m_castTime; castPacket.data().target_id = m_pTarget->getId(); - m_pSource->sendToInRangeSet( castPacket, true ); + m_pSource->sendToInRangeSet( castPacket, false ); m_pSource->getAsPlayer()->setStateFlag( PlayerStateFlag::Casting ); m_pSource->getAsPlayer()->sendStateFlags(); diff --git a/src/servers/Server_Zone/Actor/Actor.cpp b/src/servers/Server_Zone/Actor/Actor.cpp index cfc75249..6a3d45e3 100644 --- a/src/servers/Server_Zone/Actor/Actor.cpp +++ b/src/servers/Server_Zone/Actor/Actor.cpp @@ -216,7 +216,7 @@ void Core::Entity::Actor::die() // if the actor is a player, the update needs to be send to himself too bool selfNeedsUpdate = isPlayer(); - sendToInRangeSet( ActorControlPacket142( m_id, SetStatus, static_cast< uint8_t>( ActorStatus::Dead ) ), selfNeedsUpdate ); + sendToInRangeSet( ActorControlPacket142( m_id, SetStatus, static_cast< uint8_t >( ActorStatus::Dead ) ), selfNeedsUpdate ); // TODO: not all actor show the death animation when they die, some quest npcs might just despawn // although that might be handled by setting the HP to 1 and doing some script magic diff --git a/src/servers/Server_Zone/StatusEffect/StatusEffectContainer.cpp b/src/servers/Server_Zone/StatusEffect/StatusEffectContainer.cpp index ba5d7860..3feea268 100644 --- a/src/servers/Server_Zone/StatusEffect/StatusEffectContainer.cpp +++ b/src/servers/Server_Zone/StatusEffect/StatusEffectContainer.cpp @@ -116,7 +116,7 @@ void Core::StatusEffect::StatusEffectContainer::sendUpdate() slot++; } - bool sendToSelf = m_pOwner->isPlayer() ? true : false; + bool sendToSelf = m_pOwner->isPlayer(); m_pOwner->sendToInRangeSet( statusEffectList, sendToSelf ); }