Skip to content

[pull] master from rathena:master #138

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
Jan 16, 2026
Merged

[pull] master from rathena:master #138

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
34 changes: 0 additions & 34 deletions src/map/battle.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3314,14 +3314,6 @@ static bool is_attack_hitting(struct Damage* wd, block_list *src, block_list *ta
case ML_PIERCE:
hitrate += hitrate * 5 * skill_lv / 100;
break;
case AS_SONICBLOW:
if(sd && pc_checkskill(sd,AS_SONICACCEL) > 0)
#ifdef RENEWAL
hitrate += hitrate * 90 / 100;
#else
hitrate += hitrate * 50 / 100;
#endif
break;
case RK_SONICWAVE:
hitrate += hitrate * 3 * skill_lv / 100; // !TODO: Confirm the hitrate bonus
break;
Expand Down Expand Up @@ -4753,20 +4745,6 @@ static int32 battle_calc_attack_skill_ratio(struct Damage* wd, block_list *src,b
case MS_BOWLINGBASH:
skillratio += 40 * skill_lv;
break;
case AS_GRIMTOOTH:
skillratio += 20 * skill_lv;
break;
case AS_SONICBLOW:
#ifdef RENEWAL
skillratio += 100 + 100 * skill_lv;
if (tstatus->hp < (tstatus->max_hp / 2))
skillratio += skillratio / 2;
#else
skillratio += 200 + 50 * skill_lv;
if (sd && pc_checkskill(sd, AS_SONICACCEL) > 0)
skillratio += skillratio / 10;
#endif
break;
case NPC_PIERCINGATT:
skillratio += -25; //75% base damage
break;
Expand Down Expand Up @@ -4961,15 +4939,6 @@ static int32 battle_calc_attack_skill_ratio(struct Damage* wd, block_list *src,b
skillratio += 100 + 100 * skill_lv;
#endif
break;
case AS_SPLASHER:
#ifdef RENEWAL
skillratio += -100 + 400 + 100 * skill_lv;
#else
skillratio += 400 + 50 * skill_lv;
#endif
if(sd)
skillratio += 20 * pc_checkskill(sd,AS_POISONREACT);
break;
case ASC_BREAKER:
#ifdef RENEWAL
skillratio += -100 + 150 * skill_lv + sstatus->str + sstatus->int_; // !TODO: Confirm stat modifier
Expand Down Expand Up @@ -5053,9 +5022,6 @@ static int32 battle_calc_attack_skill_ratio(struct Damage* wd, block_list *src,b
case KN_CHARGEATK:
skillratio += 600;
break;
case AS_VENOMKNIFE:
skillratio += 400;
break;
#else
case KN_CHARGEATK: { // +100% every 3 cells of distance but hard-limited to 500%
int32 k = (wd->miscflag-1)/3;
Expand Down
14 changes: 14 additions & 0 deletions src/map/map-server-generator.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -396,14 +396,17 @@
<ClInclude Include="skills/taekwon/turnkick.hpp" />
<ClInclude Include="skills/thief/backslide.hpp" />
<ClInclude Include="skills/thief/backstab.hpp" />
<ClInclude Include="skills/thief/cloaking.hpp" />
<ClInclude Include="skills/thief/closeconfine.hpp" />
<ClInclude Include="skills/thief/detoxify.hpp" />
<ClInclude Include="skills/thief/divestarmor.hpp" />
<ClInclude Include="skills/thief/divesthelm.hpp" />
<ClInclude Include="skills/thief/divestshield.hpp" />
<ClInclude Include="skills/thief/divestweapon.hpp" />
<ClInclude Include="skills/thief/enchantpoison.hpp" />
<ClInclude Include="skills/thief/envenom.hpp" />
<ClInclude Include="skills/thief/findstone.hpp" />
<ClInclude Include="skills/thief/grimtooth.hpp" />
<ClInclude Include="skills/thief/hiding.hpp" />
<ClInclude Include="skills/thief/mug.hpp" />
<ClInclude Include="skills/thief/remover.hpp" />
Expand All @@ -412,8 +415,12 @@
<ClInclude Include="skills/thief/sightlessmind.hpp" />
<ClInclude Include="skills/thief/skill_factory_thief.hpp" />
<ClInclude Include="skills/thief/snatch.hpp" />
<ClInclude Include="skills/thief/sonicblow.hpp" />
<ClInclude Include="skills/thief/steal.hpp" />
<ClInclude Include="skills/thief/stonefling.hpp" />
<ClInclude Include="skills/thief/throwvenomknife.hpp" />
<ClInclude Include="skills/thief/venomdust.hpp" />
<ClInclude Include="skills/thief/venomsplasher.hpp" />
<ClInclude Include="skills/weapon_skill_impl.hpp" />
</ItemGroup>
<ItemGroup>
Expand Down Expand Up @@ -618,14 +625,17 @@
<ClCompile Include="skills/taekwon/turnkick.cpp" />
<ClCompile Include="skills/thief/backslide.cpp" />
<ClCompile Include="skills/thief/backstab.cpp" />
<ClCompile Include="skills/thief/cloaking.cpp" />
<ClCompile Include="skills/thief/closeconfine.cpp" />
<ClCompile Include="skills/thief/detoxify.cpp" />
<ClCompile Include="skills/thief/divestarmor.cpp" />
<ClCompile Include="skills/thief/divesthelm.cpp" />
<ClCompile Include="skills/thief/divestshield.cpp" />
<ClCompile Include="skills/thief/divestweapon.cpp" />
<ClCompile Include="skills/thief/enchantpoison.cpp" />
<ClCompile Include="skills/thief/envenom.cpp" />
<ClCompile Include="skills/thief/findstone.cpp" />
<ClCompile Include="skills/thief/grimtooth.cpp" />
<ClCompile Include="skills/thief/hiding.cpp" />
<ClCompile Include="skills/thief/mug.cpp" />
<ClCompile Include="skills/thief/remover.cpp" />
Expand All @@ -634,8 +644,12 @@
<ClCompile Include="skills/thief/sightlessmind.cpp" />
<ClCompile Include="skills/thief/skill_factory_thief.cpp" />
<ClCompile Include="skills/thief/snatch.cpp" />
<ClCompile Include="skills/thief/sonicblow.cpp" />
<ClCompile Include="skills/thief/steal.cpp" />
<ClCompile Include="skills/thief/stonefling.cpp" />
<ClCompile Include="skills/thief/throwvenomknife.cpp" />
<ClCompile Include="skills/thief/venomdust.cpp" />
<ClCompile Include="skills/thief/venomsplasher.cpp" />
<ClCompile Include="skills/weapon_skill_impl.cpp" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
Expand Down
42 changes: 42 additions & 0 deletions src/map/map-server-generator.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -837,6 +837,9 @@
<ClInclude Include="skills/thief/backstab.hpp">
<Filter>Header Files\Skills\Thief</Filter>
</ClInclude>
<ClInclude Include="skills/thief/cloaking.hpp">
<Filter>Header Files\Skills\Thief</Filter>
</ClInclude>
<ClInclude Include="skills/thief/closeconfine.hpp">
<Filter>Header Files\Skills\Thief</Filter>
</ClInclude>
Expand All @@ -855,12 +858,18 @@
<ClInclude Include="skills/thief/divestweapon.hpp">
<Filter>Header Files\Skills\Thief</Filter>
</ClInclude>
<ClInclude Include="skills/thief/enchantpoison.hpp">
<Filter>Header Files\Skills\Thief</Filter>
</ClInclude>
<ClInclude Include="skills/thief/envenom.hpp">
<Filter>Header Files\Skills\Thief</Filter>
</ClInclude>
<ClInclude Include="skills/thief/findstone.hpp">
<Filter>Header Files\Skills\Thief</Filter>
</ClInclude>
<ClInclude Include="skills/thief/grimtooth.hpp">
<Filter>Header Files\Skills\Thief</Filter>
</ClInclude>
<ClInclude Include="skills/thief/hiding.hpp">
<Filter>Header Files\Skills\Thief</Filter>
</ClInclude>
Expand All @@ -885,12 +894,24 @@
<ClInclude Include="skills/thief/snatch.hpp">
<Filter>Header Files\Skills\Thief</Filter>
</ClInclude>
<ClInclude Include="skills/thief/sonicblow.hpp">
<Filter>Header Files\Skills\Thief</Filter>
</ClInclude>
<ClInclude Include="skills/thief/steal.hpp">
<Filter>Header Files\Skills\Thief</Filter>
</ClInclude>
<ClInclude Include="skills/thief/stonefling.hpp">
<Filter>Header Files\Skills\Thief</Filter>
</ClInclude>
<ClInclude Include="skills/thief/throwvenomknife.hpp">
<Filter>Header Files\Skills\Thief</Filter>
</ClInclude>
<ClInclude Include="skills/thief/venomdust.hpp">
<Filter>Header Files\Skills\Thief</Filter>
</ClInclude>
<ClInclude Include="skills/thief/venomsplasher.hpp">
<Filter>Header Files\Skills\Thief</Filter>
</ClInclude>
<ClInclude Include="skills/weapon_skill_impl.hpp">
<Filter>Header Files\Skills</Filter>
</ClInclude>
Expand Down Expand Up @@ -1361,6 +1382,9 @@
<ClCompile Include="skills/thief/backstab.cpp">
<Filter>Source Files\Skills\Thief</Filter>
</ClCompile>
<ClCompile Include="skills/thief/cloaking.cpp">
<Filter>Source Files\Skills\Thief</Filter>
</ClCompile>
<ClCompile Include="skills/thief/closeconfine.cpp">
<Filter>Source Files\Skills\Thief</Filter>
</ClCompile>
Expand All @@ -1379,12 +1403,18 @@
<ClCompile Include="skills/thief/divestweapon.cpp">
<Filter>Source Files\Skills\Thief</Filter>
</ClCompile>
<ClCompile Include="skills/thief/enchantpoison.cpp">
<Filter>Source Files\Skills\Thief</Filter>
</ClCompile>
<ClCompile Include="skills/thief/envenom.cpp">
<Filter>Source Files\Skills\Thief</Filter>
</ClCompile>
<ClCompile Include="skills/thief/findstone.cpp">
<Filter>Source Files\Skills\Thief</Filter>
</ClCompile>
<ClCompile Include="skills/thief/grimtooth.cpp">
<Filter>Source Files\Skills\Thief</Filter>
</ClCompile>
<ClCompile Include="skills/thief/hiding.cpp">
<Filter>Source Files\Skills\Thief</Filter>
</ClCompile>
Expand All @@ -1409,12 +1439,24 @@
<ClCompile Include="skills/thief/snatch.cpp">
<Filter>Source Files\Skills\Thief</Filter>
</ClCompile>
<ClCompile Include="skills/thief/sonicblow.cpp">
<Filter>Source Files\Skills\Thief</Filter>
</ClCompile>
<ClCompile Include="skills/thief/steal.cpp">
<Filter>Source Files\Skills\Thief</Filter>
</ClCompile>
<ClCompile Include="skills/thief/stonefling.cpp">
<Filter>Source Files\Skills\Thief</Filter>
</ClCompile>
<ClCompile Include="skills/thief/throwvenomknife.cpp">
<Filter>Source Files\Skills\Thief</Filter>
</ClCompile>
<ClCompile Include="skills/thief/venomdust.cpp">
<Filter>Source Files\Skills\Thief</Filter>
</ClCompile>
<ClCompile Include="skills/thief/venomsplasher.cpp">
<Filter>Source Files\Skills\Thief</Filter>
</ClCompile>
<ClCompile Include="skills/weapon_skill_impl.cpp">
<Filter>Source Files\Skills</Filter>
</ClCompile>
Expand Down
14 changes: 14 additions & 0 deletions src/map/map-server.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -396,14 +396,17 @@
<ClInclude Include="skills/taekwon/turnkick.hpp" />
<ClInclude Include="skills/thief/backslide.hpp" />
<ClInclude Include="skills/thief/backstab.hpp" />
<ClInclude Include="skills/thief/cloaking.hpp" />
<ClInclude Include="skills/thief/closeconfine.hpp" />
<ClInclude Include="skills/thief/detoxify.hpp" />
<ClInclude Include="skills/thief/divestarmor.hpp" />
<ClInclude Include="skills/thief/divesthelm.hpp" />
<ClInclude Include="skills/thief/divestshield.hpp" />
<ClInclude Include="skills/thief/divestweapon.hpp" />
<ClInclude Include="skills/thief/enchantpoison.hpp" />
<ClInclude Include="skills/thief/envenom.hpp" />
<ClInclude Include="skills/thief/findstone.hpp" />
<ClInclude Include="skills/thief/grimtooth.hpp" />
<ClInclude Include="skills/thief/hiding.hpp" />
<ClInclude Include="skills/thief/mug.hpp" />
<ClInclude Include="skills/thief/remover.hpp" />
Expand All @@ -412,8 +415,12 @@
<ClInclude Include="skills/thief/sightlessmind.hpp" />
<ClInclude Include="skills/thief/skill_factory_thief.hpp" />
<ClInclude Include="skills/thief/snatch.hpp" />
<ClInclude Include="skills/thief/sonicblow.hpp" />
<ClInclude Include="skills/thief/steal.hpp" />
<ClInclude Include="skills/thief/stonefling.hpp" />
<ClInclude Include="skills/thief/throwvenomknife.hpp" />
<ClInclude Include="skills/thief/venomdust.hpp" />
<ClInclude Include="skills/thief/venomsplasher.hpp" />
<ClInclude Include="skills/weapon_skill_impl.hpp" />
</ItemGroup>
<ItemGroup>
Expand Down Expand Up @@ -618,14 +625,17 @@
<ClCompile Include="skills/taekwon/turnkick.cpp" />
<ClCompile Include="skills/thief/backslide.cpp" />
<ClCompile Include="skills/thief/backstab.cpp" />
<ClCompile Include="skills/thief/cloaking.cpp" />
<ClCompile Include="skills/thief/closeconfine.cpp" />
<ClCompile Include="skills/thief/detoxify.cpp" />
<ClCompile Include="skills/thief/divestarmor.cpp" />
<ClCompile Include="skills/thief/divesthelm.cpp" />
<ClCompile Include="skills/thief/divestshield.cpp" />
<ClCompile Include="skills/thief/divestweapon.cpp" />
<ClCompile Include="skills/thief/enchantpoison.cpp" />
<ClCompile Include="skills/thief/envenom.cpp" />
<ClCompile Include="skills/thief/findstone.cpp" />
<ClCompile Include="skills/thief/grimtooth.cpp" />
<ClCompile Include="skills/thief/hiding.cpp" />
<ClCompile Include="skills/thief/mug.cpp" />
<ClCompile Include="skills/thief/remover.cpp" />
Expand All @@ -634,8 +644,12 @@
<ClCompile Include="skills/thief/sightlessmind.cpp" />
<ClCompile Include="skills/thief/skill_factory_thief.cpp" />
<ClCompile Include="skills/thief/snatch.cpp" />
<ClCompile Include="skills/thief/sonicblow.cpp" />
<ClCompile Include="skills/thief/steal.cpp" />
<ClCompile Include="skills/thief/stonefling.cpp" />
<ClCompile Include="skills/thief/throwvenomknife.cpp" />
<ClCompile Include="skills/thief/venomdust.cpp" />
<ClCompile Include="skills/thief/venomsplasher.cpp" />
<ClCompile Include="skills/weapon_skill_impl.cpp" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
Expand Down
Loading
Loading