Skip to content

[pull] master from rathena:master #272

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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 2 commits into from
Aug 18, 2026
Merged

[pull] master from rathena:master #272

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9e4bd85
Hyper Novice (#10085)
Atemo Aug 18, 2026
963d2ba
Spirit Handler (#10086)
Atemo Aug 18, 2026
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
24 changes: 12 additions & 12 deletions db/re/skill_db.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40896,7 +40896,7 @@ Body:
TargetType: Attack
DamageFlags:
Critical: true
Range: -11
Range: -9
Hit: Multi_Hit
HitCount: -2
GiveAp: 1
Expand Down Expand Up @@ -41283,7 +41283,7 @@ Body:
MaxLevel: 7
Type: Magic
TargetType: Attack
Range: -11
Range: -9
GiveAp: 1
Hit: Single
HitCount: 1
Expand Down Expand Up @@ -41320,18 +41320,18 @@ Body:
FixedCastTime: 1500
Duration1:
- Level: 1
Time: 30000
- Level: 2
Time: 60000
- Level: 3
- Level: 2
Time: 90000
- Level: 3
Time: 120000
- Level: 4
Time: 12000
- Level: 5
Time: 150000
- Level: 5
Time: 180000
Requires:
SpCost: 100
ApCost: 150
ApCost: 125
Status: Temporary_Communion
- Id: 5448
Name: SH_BLESSING_OF_MYSTICAL_CREATURES
Expand Down Expand Up @@ -43264,7 +43264,7 @@ Body:
FixedCastTime: 1000
Requires:
SpCost: 150
ApCost: 150
ApCost: 120
Status: Breakinglimit
- Id: 5462
Name: HN_RULEBREAK
Expand All @@ -43279,7 +43279,7 @@ Body:
FixedCastTime: 1000
Requires:
SpCost: 150
ApCost: 150
ApCost: 120
Status: Rulebreak
- Id: 5463
Name: SKE_SKY_MASTERY
Expand Down Expand Up @@ -44818,7 +44818,7 @@ Body:
TargetType: Attack
DamageFlags:
Critical: true
Range: 7
Range: 9
Hit: Multi_Hit
HitCount: 5
GiveAp: 1
Expand All @@ -44839,7 +44839,7 @@ Body:
- Level: 7
Area: 3
CastCancel: true
AfterCastActDelay: 1000
AfterCastActDelay: 700
Cooldown: 700
FixedCastTime: 1000
Requires:
Expand Down
2 changes: 1 addition & 1 deletion src/map/skills/summoner/chulhobattering.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ void SkillChulhoBattering::calculateSkillRatio(const Damage *wd, const block_lis
const status_data* sstatus = status_get_status_data(*src);
const map_session_data* sd = BL_CAST(BL_PC, src);

skillratio += -100 + 480 + 160 * skill_lv;
skillratio += -100 + 550 + 250 * skill_lv;
skillratio += 70 * pc_checkskill(sd, SH_MYSTICAL_CREATURE_MASTERY);
skillratio += 5 * sstatus->pow;
RE_LVL_DMOD(100);
Expand Down
4 changes: 2 additions & 2 deletions src/map/skills/summoner/chulhosonicclaw.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@ void SkillChulhoSonicClaw::calculateSkillRatio(const Damage *wd, const block_lis
const status_change *sc = status_get_sc(src);
const map_session_data* sd = BL_CAST(BL_PC, src);

skillratio += -100 + 1100 + 2200 * skill_lv;
skillratio += -100 + 1450 + 2650 * skill_lv;
skillratio += 50 * pc_checkskill(sd, SH_MYSTICAL_CREATURE_MASTERY);
skillratio += 5 * sstatus->pow;

if( pc_checkskill( sd, SH_COMMUNE_WITH_CHUL_HO ) > 0 || ( sc != nullptr && sc->getSCE( SC_TEMPORARY_COMMUNION ) != nullptr ) ){
skillratio += 400 * skill_lv;
skillratio += -50 + 350 * skill_lv;
skillratio += 50 * pc_checkskill(sd, SH_MYSTICAL_CREATURE_MASTERY);
}
RE_LVL_DMOD(100);
Expand Down
4 changes: 2 additions & 2 deletions src/map/skills/summoner/hyunrokcannon.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@ void SkillHyunrokCannon::calculateSkillRatio(const Damage *wd, const block_list
const status_change *sc = status_get_sc(src);
const map_session_data* sd = BL_CAST(BL_PC, src);

skillratio += -100 + 1100 + 2050 * skill_lv;
skillratio += -100 + 1450 + 2250 * skill_lv;
skillratio += 50 * pc_checkskill(sd, SH_MYSTICAL_CREATURE_MASTERY);
skillratio += 5 * sstatus->spl;

if( pc_checkskill( sd, SH_COMMUNE_WITH_HYUN_ROK ) > 0 || ( sc != nullptr && sc->getSCE( SC_TEMPORARY_COMMUNION ) != nullptr ) ){
skillratio += 400 * skill_lv;
skillratio += 450 * skill_lv;
skillratio += 25 * pc_checkskill(sd, SH_MYSTICAL_CREATURE_MASTERY);
}
RE_LVL_DMOD(100);
Expand Down
Loading