Skip to content

[pull] master from rathena:master #141

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 2 commits into from
Jan 20, 2026
Merged

[pull] master from rathena:master #141

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
32f40c0
Split up Stalker skills (#9751)
Atemo Jan 19, 2026
5c6cd2b
Split up Soul Linker skills (#9758)
Atemo Jan 19, 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
9 changes: 0 additions & 9 deletions src/map/battle.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8266,15 +8266,6 @@ struct Damage battle_calc_magic_attack(block_list *src,block_list *target,uint16
skillratio += 25;
#endif
break;
case SL_STIN: //Target size must be small (0) for full damage
skillratio += (tstatus->size != SZ_SMALL ? -99 : 10 * skill_lv);
break;
case SL_STUN:
skillratio += 5 * skill_lv;
break;
case SL_SMA: //Base damage is 40% + lv%
skillratio += -60 + status_get_lv(src);
break;
case NJ_KOUENKA:
skillratio -= 10;
if(sd && sd->spiritcharm_type == CHARM_TYPE_FIRE && sd->spiritcharm > 0)
Expand Down
58 changes: 58 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 @@ -393,20 +393,48 @@
<ClInclude Include="skills/swordman/spearstab.hpp" />
<ClInclude Include="skills/taekwon/counter.hpp" />
<ClInclude Include="skills/taekwon/downkick.hpp" />
<ClInclude Include="skills/taekwon/eska.hpp" />
<ClInclude Include="skills/taekwon/eske.hpp" />
<ClInclude Include="skills/taekwon/esma.hpp" />
<ClInclude Include="skills/taekwon/estin.hpp" />
<ClInclude Include="skills/taekwon/estun.hpp" />
<ClInclude Include="skills/taekwon/eswoo.hpp" />
<ClInclude Include="skills/taekwon/highjump.hpp" />
<ClInclude Include="skills/taekwon/jumpkick.hpp" />
<ClInclude Include="skills/taekwon/kaahi.hpp" />
<ClInclude Include="skills/taekwon/kaite.hpp" />
<ClInclude Include="skills/taekwon/kaizel.hpp" />
<ClInclude Include="skills/taekwon/kaupe.hpp" />
<ClInclude Include="skills/taekwon/mission.hpp" />
<ClInclude Include="skills/taekwon/run.hpp" />
<ClInclude Include="skills/taekwon/sevenwind.hpp" />
<ClInclude Include="skills/taekwon/skill_factory_taekwon.hpp" />
<ClInclude Include="skills/taekwon/spiritofrebirth.hpp" />
<ClInclude Include="skills/taekwon/spiritofthealchemist.hpp" />
<ClInclude Include="skills/taekwon/spiritoftheartist.hpp" />
<ClInclude Include="skills/taekwon/spiritoftheassasin.hpp" />
<ClInclude Include="skills/taekwon/spiritoftheblacksmith.hpp" />
<ClInclude Include="skills/taekwon/spiritofthecrusader.hpp" />
<ClInclude Include="skills/taekwon/spiritofthehunter.hpp" />
<ClInclude Include="skills/taekwon/spiritoftheknight.hpp" />
<ClInclude Include="skills/taekwon/spiritofthemonk.hpp" />
<ClInclude Include="skills/taekwon/spiritofthepriest.hpp" />
<ClInclude Include="skills/taekwon/spiritoftherogue.hpp" />
<ClInclude Include="skills/taekwon/spiritofthesage.hpp" />
<ClInclude Include="skills/taekwon/spiritofthesoullinker.hpp" />
<ClInclude Include="skills/taekwon/spiritofthestargladiator.hpp" />
<ClInclude Include="skills/taekwon/spiritofthesupernovice.hpp" />
<ClInclude Include="skills/taekwon/spiritofthewizard.hpp" />
<ClInclude Include="skills/taekwon/stormkick.hpp" />
<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/counterinstinct.hpp" />
<ClInclude Include="skills/thief/createdeadlypoison.hpp" />
<ClInclude Include="skills/thief/detoxify.hpp" />
<ClInclude Include="skills/thief/divestall.hpp" />
<ClInclude Include="skills/thief/divestarmor.hpp" />
<ClInclude Include="skills/thief/divesthelm.hpp" />
<ClInclude Include="skills/thief/divestshield.hpp" />
Expand All @@ -428,6 +456,7 @@
<ClInclude Include="skills/thief/sonicblow.hpp" />
<ClInclude Include="skills/thief/souldestroyer.hpp" />
<ClInclude Include="skills/thief/steal.hpp" />
<ClInclude Include="skills/thief/stealth.hpp" />
<ClInclude Include="skills/thief/stonefling.hpp" />
<ClInclude Include="skills/thief/throwvenomknife.hpp" />
<ClInclude Include="skills/thief/venomdust.hpp" />
Expand Down Expand Up @@ -633,20 +662,48 @@
<ClCompile Include="skills/swordman/spearstab.cpp" />
<ClCompile Include="skills/taekwon/counter.cpp" />
<ClCompile Include="skills/taekwon/downkick.cpp" />
<ClCompile Include="skills/taekwon/eska.cpp" />
<ClCompile Include="skills/taekwon/eske.cpp" />
<ClCompile Include="skills/taekwon/esma.cpp" />
<ClCompile Include="skills/taekwon/estin.cpp" />
<ClCompile Include="skills/taekwon/estun.cpp" />
<ClCompile Include="skills/taekwon/eswoo.cpp" />
<ClCompile Include="skills/taekwon/highjump.cpp" />
<ClCompile Include="skills/taekwon/jumpkick.cpp" />
<ClCompile Include="skills/taekwon/kaahi.cpp" />
<ClCompile Include="skills/taekwon/kaite.cpp" />
<ClCompile Include="skills/taekwon/kaizel.cpp" />
<ClCompile Include="skills/taekwon/kaupe.cpp" />
<ClCompile Include="skills/taekwon/mission.cpp" />
<ClCompile Include="skills/taekwon/run.cpp" />
<ClCompile Include="skills/taekwon/sevenwind.cpp" />
<ClCompile Include="skills/taekwon/skill_factory_taekwon.cpp" />
<ClCompile Include="skills/taekwon/spiritofrebirth.cpp" />
<ClCompile Include="skills/taekwon/spiritofthealchemist.cpp" />
<ClCompile Include="skills/taekwon/spiritoftheartist.cpp" />
<ClCompile Include="skills/taekwon/spiritoftheassasin.cpp" />
<ClCompile Include="skills/taekwon/spiritoftheblacksmith.cpp" />
<ClCompile Include="skills/taekwon/spiritofthecrusader.cpp" />
<ClCompile Include="skills/taekwon/spiritofthehunter.cpp" />
<ClCompile Include="skills/taekwon/spiritoftheknight.cpp" />
<ClCompile Include="skills/taekwon/spiritofthemonk.cpp" />
<ClCompile Include="skills/taekwon/spiritofthepriest.cpp" />
<ClCompile Include="skills/taekwon/spiritoftherogue.cpp" />
<ClCompile Include="skills/taekwon/spiritofthesage.cpp" />
<ClCompile Include="skills/taekwon/spiritofthesoullinker.cpp" />
<ClCompile Include="skills/taekwon/spiritofthestargladiator.cpp" />
<ClCompile Include="skills/taekwon/spiritofthesupernovice.cpp" />
<ClCompile Include="skills/taekwon/spiritofthewizard.cpp" />
<ClCompile Include="skills/taekwon/stormkick.cpp" />
<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/counterinstinct.cpp" />
<ClCompile Include="skills/thief/createdeadlypoison.cpp" />
<ClCompile Include="skills/thief/detoxify.cpp" />
<ClCompile Include="skills/thief/divestall.cpp" />
<ClCompile Include="skills/thief/divestarmor.cpp" />
<ClCompile Include="skills/thief/divesthelm.cpp" />
<ClCompile Include="skills/thief/divestshield.cpp" />
Expand All @@ -668,6 +725,7 @@
<ClCompile Include="skills/thief/sonicblow.cpp" />
<ClCompile Include="skills/thief/souldestroyer.cpp" />
<ClCompile Include="skills/thief/steal.cpp" />
<ClCompile Include="skills/thief/stealth.cpp" />
<ClCompile Include="skills/thief/stonefling.cpp" />
<ClCompile Include="skills/thief/throwvenomknife.cpp" />
<ClCompile Include="skills/thief/venomdust.cpp" />
Expand Down
174 changes: 174 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 @@ -828,12 +828,42 @@
<ClInclude Include="skills/taekwon/downkick.hpp">
<Filter>Header Files\Skills\Taekwon</Filter>
</ClInclude>
<ClInclude Include="skills/taekwon/eska.hpp">
<Filter>Header Files\Skills\Taekwon</Filter>
</ClInclude>
<ClInclude Include="skills/taekwon/eske.hpp">
<Filter>Header Files\Skills\Taekwon</Filter>
</ClInclude>
<ClInclude Include="skills/taekwon/esma.hpp">
<Filter>Header Files\Skills\Taekwon</Filter>
</ClInclude>
<ClInclude Include="skills/taekwon/estin.hpp">
<Filter>Header Files\Skills\Taekwon</Filter>
</ClInclude>
<ClInclude Include="skills/taekwon/estun.hpp">
<Filter>Header Files\Skills\Taekwon</Filter>
</ClInclude>
<ClInclude Include="skills/taekwon/eswoo.hpp">
<Filter>Header Files\Skills\Taekwon</Filter>
</ClInclude>
<ClInclude Include="skills/taekwon/highjump.hpp">
<Filter>Header Files\Skills\Taekwon</Filter>
</ClInclude>
<ClInclude Include="skills/taekwon/jumpkick.hpp">
<Filter>Header Files\Skills\Taekwon</Filter>
</ClInclude>
<ClInclude Include="skills/taekwon/kaahi.hpp">
<Filter>Header Files\Skills\Taekwon</Filter>
</ClInclude>
<ClInclude Include="skills/taekwon/kaite.hpp">
<Filter>Header Files\Skills\Taekwon</Filter>
</ClInclude>
<ClInclude Include="skills/taekwon/kaizel.hpp">
<Filter>Header Files\Skills\Taekwon</Filter>
</ClInclude>
<ClInclude Include="skills/taekwon/kaupe.hpp">
<Filter>Header Files\Skills\Taekwon</Filter>
</ClInclude>
<ClInclude Include="skills/taekwon/mission.hpp">
<Filter>Header Files\Skills\Taekwon</Filter>
</ClInclude>
Expand All @@ -846,6 +876,54 @@
<ClInclude Include="skills/taekwon/skill_factory_taekwon.hpp">
<Filter>Header Files\Skills\Taekwon</Filter>
</ClInclude>
<ClInclude Include="skills/taekwon/spiritofrebirth.hpp">
<Filter>Header Files\Skills\Taekwon</Filter>
</ClInclude>
<ClInclude Include="skills/taekwon/spiritofthealchemist.hpp">
<Filter>Header Files\Skills\Taekwon</Filter>
</ClInclude>
<ClInclude Include="skills/taekwon/spiritoftheartist.hpp">
<Filter>Header Files\Skills\Taekwon</Filter>
</ClInclude>
<ClInclude Include="skills/taekwon/spiritoftheassasin.hpp">
<Filter>Header Files\Skills\Taekwon</Filter>
</ClInclude>
<ClInclude Include="skills/taekwon/spiritoftheblacksmith.hpp">
<Filter>Header Files\Skills\Taekwon</Filter>
</ClInclude>
<ClInclude Include="skills/taekwon/spiritofthecrusader.hpp">
<Filter>Header Files\Skills\Taekwon</Filter>
</ClInclude>
<ClInclude Include="skills/taekwon/spiritofthehunter.hpp">
<Filter>Header Files\Skills\Taekwon</Filter>
</ClInclude>
<ClInclude Include="skills/taekwon/spiritoftheknight.hpp">
<Filter>Header Files\Skills\Taekwon</Filter>
</ClInclude>
<ClInclude Include="skills/taekwon/spiritofthemonk.hpp">
<Filter>Header Files\Skills\Taekwon</Filter>
</ClInclude>
<ClInclude Include="skills/taekwon/spiritofthepriest.hpp">
<Filter>Header Files\Skills\Taekwon</Filter>
</ClInclude>
<ClInclude Include="skills/taekwon/spiritoftherogue.hpp">
<Filter>Header Files\Skills\Taekwon</Filter>
</ClInclude>
<ClInclude Include="skills/taekwon/spiritofthesage.hpp">
<Filter>Header Files\Skills\Taekwon</Filter>
</ClInclude>
<ClInclude Include="skills/taekwon/spiritofthesoullinker.hpp">
<Filter>Header Files\Skills\Taekwon</Filter>
</ClInclude>
<ClInclude Include="skills/taekwon/spiritofthestargladiator.hpp">
<Filter>Header Files\Skills\Taekwon</Filter>
</ClInclude>
<ClInclude Include="skills/taekwon/spiritofthesupernovice.hpp">
<Filter>Header Files\Skills\Taekwon</Filter>
</ClInclude>
<ClInclude Include="skills/taekwon/spiritofthewizard.hpp">
<Filter>Header Files\Skills\Taekwon</Filter>
</ClInclude>
<ClInclude Include="skills/taekwon/stormkick.hpp">
<Filter>Header Files\Skills\Taekwon</Filter>
</ClInclude>
Expand All @@ -864,12 +942,18 @@
<ClInclude Include="skills/thief/closeconfine.hpp">
<Filter>Header Files\Skills\Thief</Filter>
</ClInclude>
<ClInclude Include="skills/thief/counterinstinct.hpp">
<Filter>Header Files\Skills\Thief</Filter>
</ClInclude>
<ClInclude Include="skills/thief/createdeadlypoison.hpp">
<Filter>Header Files\Skills\Thief</Filter>
</ClInclude>
<ClInclude Include="skills/thief/detoxify.hpp">
<Filter>Header Files\Skills\Thief</Filter>
</ClInclude>
<ClInclude Include="skills/thief/divestall.hpp">
<Filter>Header Files\Skills\Thief</Filter>
</ClInclude>
<ClInclude Include="skills/thief/divestarmor.hpp">
<Filter>Header Files\Skills\Thief</Filter>
</ClInclude>
Expand Down Expand Up @@ -933,6 +1017,9 @@
<ClInclude Include="skills/thief/steal.hpp">
<Filter>Header Files\Skills\Thief</Filter>
</ClInclude>
<ClInclude Include="skills/thief/stealth.hpp">
<Filter>Header Files\Skills\Thief</Filter>
</ClInclude>
<ClInclude Include="skills/thief/stonefling.hpp">
<Filter>Header Files\Skills\Thief</Filter>
</ClInclude>
Expand Down Expand Up @@ -1406,12 +1493,42 @@
<ClCompile Include="skills/taekwon/downkick.cpp">
<Filter>Source Files\Skills\Taekwon</Filter>
</ClCompile>
<ClCompile Include="skills/taekwon/eska.cpp">
<Filter>Source Files\Skills\Taekwon</Filter>
</ClCompile>
<ClCompile Include="skills/taekwon/eske.cpp">
<Filter>Source Files\Skills\Taekwon</Filter>
</ClCompile>
<ClCompile Include="skills/taekwon/esma.cpp">
<Filter>Source Files\Skills\Taekwon</Filter>
</ClCompile>
<ClCompile Include="skills/taekwon/estin.cpp">
<Filter>Source Files\Skills\Taekwon</Filter>
</ClCompile>
<ClCompile Include="skills/taekwon/estun.cpp">
<Filter>Source Files\Skills\Taekwon</Filter>
</ClCompile>
<ClCompile Include="skills/taekwon/eswoo.cpp">
<Filter>Source Files\Skills\Taekwon</Filter>
</ClCompile>
<ClCompile Include="skills/taekwon/highjump.cpp">
<Filter>Source Files\Skills\Taekwon</Filter>
</ClCompile>
<ClCompile Include="skills/taekwon/jumpkick.cpp">
<Filter>Source Files\Skills\Taekwon</Filter>
</ClCompile>
<ClCompile Include="skills/taekwon/kaahi.cpp">
<Filter>Source Files\Skills\Taekwon</Filter>
</ClCompile>
<ClCompile Include="skills/taekwon/kaite.cpp">
<Filter>Source Files\Skills\Taekwon</Filter>
</ClCompile>
<ClCompile Include="skills/taekwon/kaizel.cpp">
<Filter>Source Files\Skills\Taekwon</Filter>
</ClCompile>
<ClCompile Include="skills/taekwon/kaupe.cpp">
<Filter>Source Files\Skills\Taekwon</Filter>
</ClCompile>
<ClCompile Include="skills/taekwon/mission.cpp">
<Filter>Source Files\Skills\Taekwon</Filter>
</ClCompile>
Expand All @@ -1424,6 +1541,54 @@
<ClCompile Include="skills/taekwon/skill_factory_taekwon.cpp">
<Filter>Source Files\Skills\Taekwon</Filter>
</ClCompile>
<ClCompile Include="skills/taekwon/spiritofrebirth.cpp">
<Filter>Source Files\Skills\Taekwon</Filter>
</ClCompile>
<ClCompile Include="skills/taekwon/spiritofthealchemist.cpp">
<Filter>Source Files\Skills\Taekwon</Filter>
</ClCompile>
<ClCompile Include="skills/taekwon/spiritoftheartist.cpp">
<Filter>Source Files\Skills\Taekwon</Filter>
</ClCompile>
<ClCompile Include="skills/taekwon/spiritoftheassasin.cpp">
<Filter>Source Files\Skills\Taekwon</Filter>
</ClCompile>
<ClCompile Include="skills/taekwon/spiritoftheblacksmith.cpp">
<Filter>Source Files\Skills\Taekwon</Filter>
</ClCompile>
<ClCompile Include="skills/taekwon/spiritofthecrusader.cpp">
<Filter>Source Files\Skills\Taekwon</Filter>
</ClCompile>
<ClCompile Include="skills/taekwon/spiritofthehunter.cpp">
<Filter>Source Files\Skills\Taekwon</Filter>
</ClCompile>
<ClCompile Include="skills/taekwon/spiritoftheknight.cpp">
<Filter>Source Files\Skills\Taekwon</Filter>
</ClCompile>
<ClCompile Include="skills/taekwon/spiritofthemonk.cpp">
<Filter>Source Files\Skills\Taekwon</Filter>
</ClCompile>
<ClCompile Include="skills/taekwon/spiritofthepriest.cpp">
<Filter>Source Files\Skills\Taekwon</Filter>
</ClCompile>
<ClCompile Include="skills/taekwon/spiritoftherogue.cpp">
<Filter>Source Files\Skills\Taekwon</Filter>
</ClCompile>
<ClCompile Include="skills/taekwon/spiritofthesage.cpp">
<Filter>Source Files\Skills\Taekwon</Filter>
</ClCompile>
<ClCompile Include="skills/taekwon/spiritofthesoullinker.cpp">
<Filter>Source Files\Skills\Taekwon</Filter>
</ClCompile>
<ClCompile Include="skills/taekwon/spiritofthestargladiator.cpp">
<Filter>Source Files\Skills\Taekwon</Filter>
</ClCompile>
<ClCompile Include="skills/taekwon/spiritofthesupernovice.cpp">
<Filter>Source Files\Skills\Taekwon</Filter>
</ClCompile>
<ClCompile Include="skills/taekwon/spiritofthewizard.cpp">
<Filter>Source Files\Skills\Taekwon</Filter>
</ClCompile>
<ClCompile Include="skills/taekwon/stormkick.cpp">
<Filter>Source Files\Skills\Taekwon</Filter>
</ClCompile>
Expand All @@ -1442,12 +1607,18 @@
<ClCompile Include="skills/thief/closeconfine.cpp">
<Filter>Source Files\Skills\Thief</Filter>
</ClCompile>
<ClCompile Include="skills/thief/counterinstinct.cpp">
<Filter>Source Files\Skills\Thief</Filter>
</ClCompile>
<ClCompile Include="skills/thief/createdeadlypoison.cpp">
<Filter>Source Files\Skills\Thief</Filter>
</ClCompile>
<ClCompile Include="skills/thief/detoxify.cpp">
<Filter>Source Files\Skills\Thief</Filter>
</ClCompile>
<ClCompile Include="skills/thief/divestall.cpp">
<Filter>Source Files\Skills\Thief</Filter>
</ClCompile>
<ClCompile Include="skills/thief/divestarmor.cpp">
<Filter>Source Files\Skills\Thief</Filter>
</ClCompile>
Expand Down Expand Up @@ -1511,6 +1682,9 @@
<ClCompile Include="skills/thief/steal.cpp">
<Filter>Source Files\Skills\Thief</Filter>
</ClCompile>
<ClCompile Include="skills/thief/stealth.cpp">
<Filter>Source Files\Skills\Thief</Filter>
</ClCompile>
<ClCompile Include="skills/thief/stonefling.cpp">
<Filter>Source Files\Skills\Thief</Filter>
</ClCompile>
Expand Down
Loading
Loading