Skip to content

[pull] master from rathena:master #209

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 1 commit into from
Mar 10, 2026
+11 −11
Merged

[pull] master from rathena:master #209

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions db/pre-re/skill_db.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14486,6 +14486,7 @@ Body:
Amount: 26
- Level: 10
Amount: 28
Status: Hiding
- Id: 529
Name: NJ_SHADOWJUMP
Description: Shadow Leap
Expand Down
1 change: 1 addition & 0 deletions db/re/skill_db.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14584,6 +14584,7 @@ Body:
Cooldown: 500
Requires:
SpCost: 8
Status: Hiding
- Id: 529
Name: NJ_SHADOWJUMP
Description: Shadow Leap
Expand Down
14 changes: 6 additions & 8 deletions src/map/skills/ninja/vanishingslash.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,17 @@

#include "map/status.hpp"

SkillVanishingSlash::SkillVanishingSlash() : StatusSkillImpl(NJ_KASUMIKIRI) {
SkillVanishingSlash::SkillVanishingSlash() : WeaponSkillImpl(NJ_KASUMIKIRI) {
}

void SkillVanishingSlash::calculateSkillRatio(const Damage *wd, const block_list *src, const block_list *target, uint16 skill_lv, int32 &base_skillratio, int32 mflag) const {
void SkillVanishingSlash::applyAdditionalEffects(block_list* src, block_list* target, uint16 skill_lv, t_tick tick, int32 attack_type, enum damage_lv dmg_lv) const {
sc_start(src, src, skill_get_sc(getSkillId()), 100, skill_lv, skill_get_time(getSkillId(), skill_lv));
}

void SkillVanishingSlash::calculateSkillRatio(const Damage* wd, const block_list* src, const block_list* target, uint16 skill_lv, int32& base_skillratio, int32 mflag) const {
#ifdef RENEWAL
base_skillratio += 20 * skill_lv;
#else
base_skillratio += 10 * skill_lv;
#endif
}

void SkillVanishingSlash::castendDamageId(block_list *src, block_list *target, uint16 skill_lv, t_tick tick, int32& flag) const {
// TODO: refactor into applyAdditionalEffects
if (skill_attack(BF_WEAPON,src,src,target,getSkillId(),skill_lv,tick,flag) > 0)
sc_start(src,src,SC_HIDING,100,skill_lv,skill_get_time(getSkillId(),skill_lv));
}
6 changes: 3 additions & 3 deletions src/map/skills/ninja/vanishingslash.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@

#include "../skill_impl.hpp"

class SkillVanishingSlash : public StatusSkillImpl {
class SkillVanishingSlash : public WeaponSkillImpl {
public:
SkillVanishingSlash();

void calculateSkillRatio(const Damage *wd, const block_list *src, const block_list *target, uint16 skill_lv, int32 &base_skillratio, int32 mflag) const override;
void castendDamageId(block_list *src, block_list *target, uint16 skill_lv, t_tick tick, int32& flag) const override;
void applyAdditionalEffects(block_list* src, block_list* target, uint16 skill_lv, t_tick tick, int32 attack_type, enum damage_lv dmg_lv) const override;
void calculateSkillRatio(const Damage* wd, const block_list* src, const block_list* target, uint16 skill_lv, int32& base_skillratio, int32 mflag) const override;
};
Loading