Skip to content

[pull] master from rathena:master #271

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 17, 2026
Merged

[pull] master from rathena:master #271

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
4fdb561
6th rebalance - Cardinal - Part 2 (#10079)
Atemo Aug 17, 2026
240f893
6th rebalance - Troubadour & Trouvere - Part 2 (#10080)
Atemo Aug 17, 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
16 changes: 8 additions & 8 deletions db/re/skill_db.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36959,7 +36959,7 @@ Body:
HitCount: 2
Element: Holy
SplashArea: 4
GiveAp: 2
GiveAp: 3
CastTime: 4000
AfterCastActDelay: 500
Duration1: 20000
Expand Down Expand Up @@ -37095,13 +37095,13 @@ Body:
- Level: 1
Amount: 200
- Level: 2
Amount: 190
Amount: 185
- Level: 3
Amount: 180
- Level: 4
Amount: 170
- Level: 4
Amount: 155
- Level: 5
Amount: 160
Amount: 140
Status: Competentia
- Id: 5279
Name: CD_PNEUMATICUS_PROCELLA
Expand Down Expand Up @@ -37199,7 +37199,7 @@ Body:
Range: 9
Hit: Single
HitCount: 1
GiveAp: 1
GiveAp: 2
AfterCastActDelay: 700
Duration1:
- Level: 1
Expand Down Expand Up @@ -37237,7 +37237,7 @@ Body:
Range: 9
Hit: Single
HitCount: 1
GiveAp: 1
GiveAp: 2
AfterCastActDelay: 700
Duration1:
- Level: 1
Expand Down Expand Up @@ -37351,7 +37351,7 @@ Body:
Area: 3
- Level: 5
Area: 3
GiveAp: 2
GiveAp: 3
CastTime: 5000
AfterCastActDelay: 500
Cooldown: 300
Expand Down
2 changes: 1 addition & 1 deletion src/map/skills/acolyte/arbitrium.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ void SkillArbitrium::calculateSkillRatio(const Damage* wd, const block_list* src
const map_session_data* sd = BL_CAST(BL_PC, src);
const status_data* sstatus = status_get_status_data(*src);

skillratio += -100 + 950 * skill_lv;
skillratio += -100 + 1200 * skill_lv;
skillratio += 10 * sstatus->spl; // TODO : spl ratio has changed ?
skillratio += 35 * pc_checkskill(sd, CD_FIDUS_ANIMUS) * skill_lv;

Expand Down
2 changes: 1 addition & 1 deletion src/map/skills/acolyte/framen.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ void SkillFramen::calculateSkillRatio(const Damage* wd, const block_list* src, c
const status_data* sstatus = status_get_status_data(*src);
const status_data* tstatus = status_get_status_data(*target);

skillratio += -100 + 1300 * skill_lv;
skillratio += -100 + 1550 * skill_lv;
skillratio += 5 * pc_checkskill(sd, CD_FIDUS_ANIMUS) * skill_lv;
skillratio += 5 * sstatus->spl;
if (tstatus->race == RC_UNDEAD || tstatus->race == RC_DEMON)
Expand Down
2 changes: 1 addition & 1 deletion src/map/skills/acolyte/petitio.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ void SkillPetitio::calculateSkillRatio(const Damage* wd, const block_list* src,
const map_session_data* sd = BL_CAST(BL_PC, src);
const status_data* sstatus = status_get_status_data(*src);

skillratio += -100 + 1200 * skill_lv;
skillratio += -100 + 1375 * skill_lv;
skillratio += pc_checkskill(sd, CD_MACE_BOOK_M) * 50 * skill_lv;
skillratio += 5 * sstatus->pow;

Expand Down
2 changes: 1 addition & 1 deletion src/map/skills/archer/roseblossom.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ void SkillRoseBlossomAttack::calculateSkillRatio(const Damage* wd, const block_l
const status_data* sstatus = status_get_status_data(*src);
const status_data* tstatus = status_get_status_data(*target);

skillratio += -100 + 250 + 2800 * skill_lv;
skillratio += -100 + 550 + 3850 * skill_lv;

if (sd && pc_checkskill(sd, TR_STAGE_MANNER) > 0)
skillratio += 3 * sstatus->con;
Expand Down
Loading