Skip to content

[pull] master from rathena:master #274

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

[pull] master from rathena:master #274

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
46b2361
6th rebalance - Imperial Guard - Part 2 (#10087)
Atemo Aug 20, 2026
12624c2
6th rebalance - Meister - Part 2 (#10088)
Atemo Aug 20, 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 @@ -37855,7 +37855,7 @@ Body:
Time: 300000
Requires:
SpCost: 150
ApCost: 150
ApCost: 125
Status: Rush_Quake2
- Id: 5297
Name: MT_M_MACHINE
Expand Down Expand Up @@ -45328,7 +45328,7 @@ Body:
- Level: 10
Area: 3
CastTime: 1000
AfterCastActDelay: 1200
AfterCastActDelay: 1000
Cooldown: 700
FixedCastTime: 1000
Requires:
Expand Down Expand Up @@ -45451,15 +45451,15 @@ Body:
Area: 3
Cooldown:
- Level: 1
Time: 2000
- Level: 2
Time: 1750
- Level: 3
- Level: 2
Time: 1500
- Level: 4
- Level: 3
Time: 1250
- Level: 5
- Level: 4
Time: 1000
- Level: 5
Time: 750
Requires:
SpCost:
- Level: 1
Expand Down Expand Up @@ -45503,15 +45503,15 @@ Body:
Requires:
SpCost:
- Level: 1
Amount: 62
Amount: 57
- Level: 2
Amount: 64
Amount: 59
- Level: 3
Amount: 66
Amount: 61
- Level: 4
Amount: 68
Amount: 63
- Level: 5
Amount: 70
Amount: 65
Weapon:
2hAxe: true
- Id: 6508
Expand Down
2 changes: 1 addition & 1 deletion src/map/skills/merchant/powerfulswing.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ void SkillPowerfulSwing::calculateSkillRatio(const Damage* wd, const block_list*
const status_data* sstatus = status_get_status_data(*src);
const status_change* sc = status_get_sc(src);

skillratio += -100 + 300 + 850 * skill_lv;
skillratio += -100 + 300 + 880 * skill_lv;
skillratio += 5 * sstatus->pow; // !TODO: check POW ratio
if (sc && sc->getSCE(SC_AXE_STOMP))
skillratio += 100 + 100 * skill_lv;
Expand Down
2 changes: 1 addition & 1 deletion src/map/skills/merchant/rushstrike.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ SkillRushStrike::SkillRushStrike() : SkillImplRecursiveDamageSplash(MT_RUSH_STRI
void SkillRushStrike::calculateSkillRatio(const Damage* wd, const block_list* src, const block_list* target, uint16 skill_lv, int32& skillratio, int32 mflag) const {
const status_data* sstatus = status_get_status_data(*src);

skillratio += -100 + 3500 * skill_lv;
skillratio += -100 + 650 + 3750 * skill_lv;
skillratio += 5 * sstatus->pow; // !TODO: check POW ratio
RE_LVL_DMOD(100);
}
Expand Down
2 changes: 1 addition & 1 deletion src/map/skills/swordman/imperialpressure.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ void SkillImperialPressure::calculateSkillRatio(const Damage* wd, const block_li
const map_session_data* sd = BL_CAST(BL_PC, src);
const status_data* sstatus = status_get_status_data(*src);

skillratio += -100 + 5600 + 1850 * skill_lv;
skillratio += -100 + 3750 + 2650 * skill_lv;
skillratio += 7 * sstatus->spl;
skillratio += 50 * pc_checkskill(sd, IG_SPEAR_SWORD_M);
RE_LVL_DMOD(100);
Expand Down
4 changes: 2 additions & 2 deletions src/map/skills/swordman/overslash.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ void SkillOverSlash::calculateSkillRatio(const Damage* wd, const block_list* src
const status_data* sstatus = status_get_status_data(*src);
int32 i;

skillratio += -100 + 220 * skill_lv;
skillratio += pc_checkskill(sd, IG_SPEAR_SWORD_M) * 50 * skill_lv;
skillratio += -100 + 260 * skill_lv;
skillratio += pc_checkskill(sd, IG_SPEAR_SWORD_M) * 60 * skill_lv;
skillratio += 7 * sstatus->pow;
RE_LVL_DMOD(100);
if ((i = pc_checkskill_imperial_guard(sd, 3)) > 0)
Expand Down
Loading