Skip to content

[pull] master from rathena:master #137

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

[pull] master from rathena:master #137

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
12 changes: 0 additions & 12 deletions src/map/battle.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4817,18 +4817,6 @@ static int32 battle_calc_attack_skill_ratio(struct Damage* wd, block_list *src,b
#endif
skillratio += 35 * skill_lv;
break;
case AM_DEMONSTRATION:
skillratio += 20 * skill_lv;
break;
case AM_ACIDTERROR:
#ifdef RENEWAL
skillratio += -100 + 200 * skill_lv;
if (sd && pc_checkskill(sd, AM_LEARNINGPOTION))
skillratio += 100; // !TODO: What's this bonus increase?
#else
skillratio += -50 + 50 * skill_lv;
#endif
break;
case MO_FINGEROFFENSIVE:
#ifdef RENEWAL
skillratio += 500 + skill_lv * 200;
Expand Down
32 changes: 32 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 @@ -334,8 +334,15 @@
<ClInclude Include="skills/mage/waterball.hpp" />
<ClInclude Include="skills/mercenary/mercenary_bash.hpp" />
<ClInclude Include="skills/mercenary/skill_factory_mercenary.hpp" />
<ClInclude Include="skills/merchant/acidterror.hpp" />
<ClInclude Include="skills/merchant/adrenalinerush.hpp" />
<ClInclude Include="skills/merchant/advancedadrenalinerush.hpp" />
<ClInclude Include="skills/merchant/aidberserkpotion.hpp" />
<ClInclude Include="skills/merchant/aidpotion.hpp" />
<ClInclude Include="skills/merchant/alchemicalweapon.hpp" />
<ClInclude Include="skills/merchant/biochemicalhelm.hpp" />
<ClInclude Include="skills/merchant/bomb.hpp" />
<ClInclude Include="skills/merchant/callhomunculus.hpp" />
<ClInclude Include="skills/merchant/cartrevolution.hpp" />
<ClInclude Include="skills/merchant/changecart.hpp" />
<ClInclude Include="skills/merchant/crazyuproar.hpp" />
Expand All @@ -345,8 +352,17 @@
<ClInclude Include="skills/merchant/itemappraisal.hpp" />
<ClInclude Include="skills/merchant/mammonite.hpp" />
<ClInclude Include="skills/merchant/powerthrust.hpp" />
<ClInclude Include="skills/merchant/preparepotion.hpp" />
<ClInclude Include="skills/merchant/skill_factory_merchant.hpp" />
<ClInclude Include="skills/merchant/skill_vending.hpp" />
<ClInclude Include="skills/merchant/summonflora.hpp" />
<ClInclude Include="skills/merchant/summonmarinesphere.hpp" />
<ClInclude Include="skills/merchant/synthesizedshield.hpp" />
<ClInclude Include="skills/merchant/syntheticarmor.hpp" />
<ClInclude Include="skills/merchant/twilightalchemy1.hpp" />
<ClInclude Include="skills/merchant/twilightalchemy2.hpp" />
<ClInclude Include="skills/merchant/twilightalchemy3.hpp" />
<ClInclude Include="skills/merchant/vaporize.hpp" />
<ClInclude Include="skills/merchant/weaponperfection.hpp" />
<ClInclude Include="skills/merchant/weaponrepair.hpp" />
<ClInclude Include="skills/ninja/skill_factory_ninja.hpp" />
Expand Down Expand Up @@ -540,8 +556,15 @@
<ClCompile Include="skills/mage/waterball.cpp" />
<ClCompile Include="skills/mercenary/mercenary_bash.cpp" />
<ClCompile Include="skills/mercenary/skill_factory_mercenary.cpp" />
<ClCompile Include="skills/merchant/acidterror.cpp" />
<ClCompile Include="skills/merchant/adrenalinerush.cpp" />
<ClCompile Include="skills/merchant/advancedadrenalinerush.cpp" />
<ClCompile Include="skills/merchant/aidberserkpotion.cpp" />
<ClCompile Include="skills/merchant/aidpotion.cpp" />
<ClCompile Include="skills/merchant/alchemicalweapon.cpp" />
<ClCompile Include="skills/merchant/biochemicalhelm.cpp" />
<ClCompile Include="skills/merchant/bomb.cpp" />
<ClCompile Include="skills/merchant/callhomunculus.cpp" />
<ClCompile Include="skills/merchant/cartrevolution.cpp" />
<ClCompile Include="skills/merchant/changecart.cpp" />
<ClCompile Include="skills/merchant/crazyuproar.cpp" />
Expand All @@ -551,8 +574,17 @@
<ClCompile Include="skills/merchant/itemappraisal.cpp" />
<ClCompile Include="skills/merchant/mammonite.cpp" />
<ClCompile Include="skills/merchant/powerthrust.cpp" />
<ClCompile Include="skills/merchant/preparepotion.cpp" />
<ClCompile Include="skills/merchant/skill_factory_merchant.cpp" />
<ClCompile Include="skills/merchant/skill_vending.cpp" />
<ClCompile Include="skills/merchant/summonflora.cpp" />
<ClCompile Include="skills/merchant/summonmarinesphere.cpp" />
<ClCompile Include="skills/merchant/synthesizedshield.cpp" />
<ClCompile Include="skills/merchant/syntheticarmor.cpp" />
<ClCompile Include="skills/merchant/twilightalchemy1.cpp" />
<ClCompile Include="skills/merchant/twilightalchemy2.cpp" />
<ClCompile Include="skills/merchant/twilightalchemy3.cpp" />
<ClCompile Include="skills/merchant/vaporize.cpp" />
<ClCompile Include="skills/merchant/weaponperfection.cpp" />
<ClCompile Include="skills/merchant/weaponrepair.cpp" />
<ClCompile Include="skills/ninja/skill_factory_ninja.cpp" />
Expand Down
96 changes: 96 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 @@ -651,12 +651,33 @@
<ClInclude Include="skills/mercenary/skill_factory_mercenary.hpp">
<Filter>Header Files\Skills\Mercenary</Filter>
</ClInclude>
<ClInclude Include="skills/merchant/acidterror.hpp">
<Filter>Header Files\Skills\Merchant</Filter>
</ClInclude>
<ClInclude Include="skills/merchant/adrenalinerush.hpp">
<Filter>Header Files\Skills\Merchant</Filter>
</ClInclude>
<ClInclude Include="skills/merchant/advancedadrenalinerush.hpp">
<Filter>Header Files\Skills\Merchant</Filter>
</ClInclude>
<ClInclude Include="skills/merchant/aidberserkpotion.hpp">
<Filter>Header Files\Skills\Merchant</Filter>
</ClInclude>
<ClInclude Include="skills/merchant/aidpotion.hpp">
<Filter>Header Files\Skills\Merchant</Filter>
</ClInclude>
<ClInclude Include="skills/merchant/alchemicalweapon.hpp">
<Filter>Header Files\Skills\Merchant</Filter>
</ClInclude>
<ClInclude Include="skills/merchant/biochemicalhelm.hpp">
<Filter>Header Files\Skills\Merchant</Filter>
</ClInclude>
<ClInclude Include="skills/merchant/bomb.hpp">
<Filter>Header Files\Skills\Merchant</Filter>
</ClInclude>
<ClInclude Include="skills/merchant/callhomunculus.hpp">
<Filter>Header Files\Skills\Merchant</Filter>
</ClInclude>
<ClInclude Include="skills/merchant/cartrevolution.hpp">
<Filter>Header Files\Skills\Merchant</Filter>
</ClInclude>
Expand Down Expand Up @@ -684,12 +705,39 @@
<ClInclude Include="skills/merchant/powerthrust.hpp">
<Filter>Header Files\Skills\Merchant</Filter>
</ClInclude>
<ClInclude Include="skills/merchant/preparepotion.hpp">
<Filter>Header Files\Skills\Merchant</Filter>
</ClInclude>
<ClInclude Include="skills/merchant/skill_factory_merchant.hpp">
<Filter>Header Files\Skills\Merchant</Filter>
</ClInclude>
<ClInclude Include="skills/merchant/skill_vending.hpp">
<Filter>Header Files\Skills\Merchant</Filter>
</ClInclude>
<ClInclude Include="skills/merchant/summonflora.hpp">
<Filter>Header Files\Skills\Merchant</Filter>
</ClInclude>
<ClInclude Include="skills/merchant/summonmarinesphere.hpp">
<Filter>Header Files\Skills\Merchant</Filter>
</ClInclude>
<ClInclude Include="skills/merchant/synthesizedshield.hpp">
<Filter>Header Files\Skills\Merchant</Filter>
</ClInclude>
<ClInclude Include="skills/merchant/syntheticarmor.hpp">
<Filter>Header Files\Skills\Merchant</Filter>
</ClInclude>
<ClInclude Include="skills/merchant/twilightalchemy1.hpp">
<Filter>Header Files\Skills\Merchant</Filter>
</ClInclude>
<ClInclude Include="skills/merchant/twilightalchemy2.hpp">
<Filter>Header Files\Skills\Merchant</Filter>
</ClInclude>
<ClInclude Include="skills/merchant/twilightalchemy3.hpp">
<Filter>Header Files\Skills\Merchant</Filter>
</ClInclude>
<ClInclude Include="skills/merchant/vaporize.hpp">
<Filter>Header Files\Skills\Merchant</Filter>
</ClInclude>
<ClInclude Include="skills/merchant/weaponperfection.hpp">
<Filter>Header Files\Skills\Merchant</Filter>
</ClInclude>
Expand Down Expand Up @@ -1127,12 +1175,33 @@
<ClCompile Include="skills/mercenary/skill_factory_mercenary.cpp">
<Filter>Source Files\Skills\Mercenary</Filter>
</ClCompile>
<ClCompile Include="skills/merchant/acidterror.cpp">
<Filter>Source Files\Skills\Merchant</Filter>
</ClCompile>
<ClCompile Include="skills/merchant/adrenalinerush.cpp">
<Filter>Source Files\Skills\Merchant</Filter>
</ClCompile>
<ClCompile Include="skills/merchant/advancedadrenalinerush.cpp">
<Filter>Source Files\Skills\Merchant</Filter>
</ClCompile>
<ClCompile Include="skills/merchant/aidberserkpotion.cpp">
<Filter>Source Files\Skills\Merchant</Filter>
</ClCompile>
<ClCompile Include="skills/merchant/aidpotion.cpp">
<Filter>Source Files\Skills\Merchant</Filter>
</ClCompile>
<ClCompile Include="skills/merchant/alchemicalweapon.cpp">
<Filter>Source Files\Skills\Merchant</Filter>
</ClCompile>
<ClCompile Include="skills/merchant/biochemicalhelm.cpp">
<Filter>Source Files\Skills\Merchant</Filter>
</ClCompile>
<ClCompile Include="skills/merchant/bomb.cpp">
<Filter>Source Files\Skills\Merchant</Filter>
</ClCompile>
<ClCompile Include="skills/merchant/callhomunculus.cpp">
<Filter>Source Files\Skills\Merchant</Filter>
</ClCompile>
<ClCompile Include="skills/merchant/cartrevolution.cpp">
<Filter>Source Files\Skills\Merchant</Filter>
</ClCompile>
Expand Down Expand Up @@ -1160,12 +1229,39 @@
<ClCompile Include="skills/merchant/powerthrust.cpp">
<Filter>Source Files\Skills\Merchant</Filter>
</ClCompile>
<ClCompile Include="skills/merchant/preparepotion.cpp">
<Filter>Source Files\Skills\Merchant</Filter>
</ClCompile>
<ClCompile Include="skills/merchant/skill_factory_merchant.cpp">
<Filter>Source Files\Skills\Merchant</Filter>
</ClCompile>
<ClCompile Include="skills/merchant/skill_vending.cpp">
<Filter>Source Files\Skills\Merchant</Filter>
</ClCompile>
<ClCompile Include="skills/merchant/summonflora.cpp">
<Filter>Source Files\Skills\Merchant</Filter>
</ClCompile>
<ClCompile Include="skills/merchant/summonmarinesphere.cpp">
<Filter>Source Files\Skills\Merchant</Filter>
</ClCompile>
<ClCompile Include="skills/merchant/synthesizedshield.cpp">
<Filter>Source Files\Skills\Merchant</Filter>
</ClCompile>
<ClCompile Include="skills/merchant/syntheticarmor.cpp">
<Filter>Source Files\Skills\Merchant</Filter>
</ClCompile>
<ClCompile Include="skills/merchant/twilightalchemy1.cpp">
<Filter>Source Files\Skills\Merchant</Filter>
</ClCompile>
<ClCompile Include="skills/merchant/twilightalchemy2.cpp">
<Filter>Source Files\Skills\Merchant</Filter>
</ClCompile>
<ClCompile Include="skills/merchant/twilightalchemy3.cpp">
<Filter>Source Files\Skills\Merchant</Filter>
</ClCompile>
<ClCompile Include="skills/merchant/vaporize.cpp">
<Filter>Source Files\Skills\Merchant</Filter>
</ClCompile>
<ClCompile Include="skills/merchant/weaponperfection.cpp">
<Filter>Source Files\Skills\Merchant</Filter>
</ClCompile>
Expand Down
32 changes: 32 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 @@ -334,8 +334,15 @@
<ClInclude Include="skills/mage/waterball.hpp" />
<ClInclude Include="skills/mercenary/mercenary_bash.hpp" />
<ClInclude Include="skills/mercenary/skill_factory_mercenary.hpp" />
<ClInclude Include="skills/merchant/acidterror.hpp" />
<ClInclude Include="skills/merchant/adrenalinerush.hpp" />
<ClInclude Include="skills/merchant/advancedadrenalinerush.hpp" />
<ClInclude Include="skills/merchant/aidberserkpotion.hpp" />
<ClInclude Include="skills/merchant/aidpotion.hpp" />
<ClInclude Include="skills/merchant/alchemicalweapon.hpp" />
<ClInclude Include="skills/merchant/biochemicalhelm.hpp" />
<ClInclude Include="skills/merchant/bomb.hpp" />
<ClInclude Include="skills/merchant/callhomunculus.hpp" />
<ClInclude Include="skills/merchant/cartrevolution.hpp" />
<ClInclude Include="skills/merchant/changecart.hpp" />
<ClInclude Include="skills/merchant/crazyuproar.hpp" />
Expand All @@ -345,8 +352,17 @@
<ClInclude Include="skills/merchant/itemappraisal.hpp" />
<ClInclude Include="skills/merchant/mammonite.hpp" />
<ClInclude Include="skills/merchant/powerthrust.hpp" />
<ClInclude Include="skills/merchant/preparepotion.hpp" />
<ClInclude Include="skills/merchant/skill_factory_merchant.hpp" />
<ClInclude Include="skills/merchant/skill_vending.hpp" />
<ClInclude Include="skills/merchant/summonflora.hpp" />
<ClInclude Include="skills/merchant/summonmarinesphere.hpp" />
<ClInclude Include="skills/merchant/synthesizedshield.hpp" />
<ClInclude Include="skills/merchant/syntheticarmor.hpp" />
<ClInclude Include="skills/merchant/twilightalchemy1.hpp" />
<ClInclude Include="skills/merchant/twilightalchemy2.hpp" />
<ClInclude Include="skills/merchant/twilightalchemy3.hpp" />
<ClInclude Include="skills/merchant/vaporize.hpp" />
<ClInclude Include="skills/merchant/weaponperfection.hpp" />
<ClInclude Include="skills/merchant/weaponrepair.hpp" />
<ClInclude Include="skills/ninja/skill_factory_ninja.hpp" />
Expand Down Expand Up @@ -540,8 +556,15 @@
<ClCompile Include="skills/mage/waterball.cpp" />
<ClCompile Include="skills/mercenary/mercenary_bash.cpp" />
<ClCompile Include="skills/mercenary/skill_factory_mercenary.cpp" />
<ClCompile Include="skills/merchant/acidterror.cpp" />
<ClCompile Include="skills/merchant/adrenalinerush.cpp" />
<ClCompile Include="skills/merchant/advancedadrenalinerush.cpp" />
<ClCompile Include="skills/merchant/aidberserkpotion.cpp" />
<ClCompile Include="skills/merchant/aidpotion.cpp" />
<ClCompile Include="skills/merchant/alchemicalweapon.cpp" />
<ClCompile Include="skills/merchant/biochemicalhelm.cpp" />
<ClCompile Include="skills/merchant/bomb.cpp" />
<ClCompile Include="skills/merchant/callhomunculus.cpp" />
<ClCompile Include="skills/merchant/cartrevolution.cpp" />
<ClCompile Include="skills/merchant/changecart.cpp" />
<ClCompile Include="skills/merchant/crazyuproar.cpp" />
Expand All @@ -551,8 +574,17 @@
<ClCompile Include="skills/merchant/itemappraisal.cpp" />
<ClCompile Include="skills/merchant/mammonite.cpp" />
<ClCompile Include="skills/merchant/powerthrust.cpp" />
<ClCompile Include="skills/merchant/preparepotion.cpp" />
<ClCompile Include="skills/merchant/skill_factory_merchant.cpp" />
<ClCompile Include="skills/merchant/skill_vending.cpp" />
<ClCompile Include="skills/merchant/summonflora.cpp" />
<ClCompile Include="skills/merchant/summonmarinesphere.cpp" />
<ClCompile Include="skills/merchant/synthesizedshield.cpp" />
<ClCompile Include="skills/merchant/syntheticarmor.cpp" />
<ClCompile Include="skills/merchant/twilightalchemy1.cpp" />
<ClCompile Include="skills/merchant/twilightalchemy2.cpp" />
<ClCompile Include="skills/merchant/twilightalchemy3.cpp" />
<ClCompile Include="skills/merchant/vaporize.cpp" />
<ClCompile Include="skills/merchant/weaponperfection.cpp" />
<ClCompile Include="skills/merchant/weaponrepair.cpp" />
<ClCompile Include="skills/ninja/skill_factory_ninja.cpp" />
Expand Down
Loading
Loading