Skip to content

[pull] master from rathena:master #140

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

[pull] master from rathena:master #140

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
17 changes: 0 additions & 17 deletions src/map/battle.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4883,14 +4883,6 @@ static int32 battle_calc_attack_skill_ratio(struct Damage* wd, block_list *src,b
RE_LVL_DMOD(100);
break;
#endif
case ASC_METEORASSAULT:
#ifdef RENEWAL
skillratio += 100 + 120 * skill_lv;
RE_LVL_DMOD(100);
#else
skillratio += -60 + 40 * skill_lv;
#endif
break;
case SN_SHARPSHOOTING:
if (src->type == BL_MOB) { // TODO: Did these formulas change in the renewal balancing?
if (wd->miscflag & 2) // Splash damage bonus
Expand Down Expand Up @@ -4921,15 +4913,6 @@ static int32 battle_calc_attack_skill_ratio(struct Damage* wd, block_list *src,b
RE_LVL_DMOD(100);
#else
skillratio += 100 + 100 * skill_lv;
#endif
break;
case ASC_BREAKER:
#ifdef RENEWAL
skillratio += -100 + 150 * skill_lv + sstatus->str + sstatus->int_; // !TODO: Confirm stat modifier
RE_LVL_DMOD(100);
#else
// Pre-Renewal: skill ratio for weapon part of damage [helvetica]
skillratio += -100 + 100 * skill_lv;
#endif
break;
case PA_SACRIFICE:
Expand Down
8 changes: 8 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 @@ -405,16 +405,19 @@
<ClInclude Include="skills/thief/backstab.hpp" />
<ClInclude Include="skills/thief/cloaking.hpp" />
<ClInclude Include="skills/thief/closeconfine.hpp" />
<ClInclude Include="skills/thief/createdeadlypoison.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/enchantdeadlypoison.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/meteorassault.hpp" />
<ClInclude Include="skills/thief/mug.hpp" />
<ClInclude Include="skills/thief/remover.hpp" />
<ClInclude Include="skills/thief/sandattack.hpp" />
Expand All @@ -423,6 +426,7 @@
<ClInclude Include="skills/thief/skill_factory_thief.hpp" />
<ClInclude Include="skills/thief/snatch.hpp" />
<ClInclude Include="skills/thief/sonicblow.hpp" />
<ClInclude Include="skills/thief/souldestroyer.hpp" />
<ClInclude Include="skills/thief/steal.hpp" />
<ClInclude Include="skills/thief/stonefling.hpp" />
<ClInclude Include="skills/thief/throwvenomknife.hpp" />
Expand Down Expand Up @@ -641,16 +645,19 @@
<ClCompile Include="skills/thief/backstab.cpp" />
<ClCompile Include="skills/thief/cloaking.cpp" />
<ClCompile Include="skills/thief/closeconfine.cpp" />
<ClCompile Include="skills/thief/createdeadlypoison.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/enchantdeadlypoison.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/meteorassault.cpp" />
<ClCompile Include="skills/thief/mug.cpp" />
<ClCompile Include="skills/thief/remover.cpp" />
<ClCompile Include="skills/thief/sandattack.cpp" />
Expand All @@ -659,6 +666,7 @@
<ClCompile Include="skills/thief/skill_factory_thief.cpp" />
<ClCompile Include="skills/thief/snatch.cpp" />
<ClCompile Include="skills/thief/sonicblow.cpp" />
<ClCompile Include="skills/thief/souldestroyer.cpp" />
<ClCompile Include="skills/thief/steal.cpp" />
<ClCompile Include="skills/thief/stonefling.cpp" />
<ClCompile Include="skills/thief/throwvenomknife.cpp" />
Expand Down
24 changes: 24 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 @@ -864,6 +864,9 @@
<ClInclude Include="skills/thief/closeconfine.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>
Expand All @@ -879,6 +882,9 @@
<ClInclude Include="skills/thief/divestweapon.hpp">
<Filter>Header Files\Skills\Thief</Filter>
</ClInclude>
<ClInclude Include="skills/thief/enchantdeadlypoison.hpp">
<Filter>Header Files\Skills\Thief</Filter>
</ClInclude>
<ClInclude Include="skills/thief/enchantpoison.hpp">
<Filter>Header Files\Skills\Thief</Filter>
</ClInclude>
Expand All @@ -894,6 +900,9 @@
<ClInclude Include="skills/thief/hiding.hpp">
<Filter>Header Files\Skills\Thief</Filter>
</ClInclude>
<ClInclude Include="skills/thief/meteorassault.hpp">
<Filter>Header Files\Skills\Thief</Filter>
</ClInclude>
<ClInclude Include="skills/thief/mug.hpp">
<Filter>Header Files\Skills\Thief</Filter>
</ClInclude>
Expand All @@ -918,6 +927,9 @@
<ClInclude Include="skills/thief/sonicblow.hpp">
<Filter>Header Files\Skills\Thief</Filter>
</ClInclude>
<ClInclude Include="skills/thief/souldestroyer.hpp">
<Filter>Header Files\Skills\Thief</Filter>
</ClInclude>
<ClInclude Include="skills/thief/steal.hpp">
<Filter>Header Files\Skills\Thief</Filter>
</ClInclude>
Expand Down Expand Up @@ -1430,6 +1442,9 @@
<ClCompile Include="skills/thief/closeconfine.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>
Expand All @@ -1445,6 +1460,9 @@
<ClCompile Include="skills/thief/divestweapon.cpp">
<Filter>Source Files\Skills\Thief</Filter>
</ClCompile>
<ClCompile Include="skills/thief/enchantdeadlypoison.cpp">
<Filter>Source Files\Skills\Thief</Filter>
</ClCompile>
<ClCompile Include="skills/thief/enchantpoison.cpp">
<Filter>Source Files\Skills\Thief</Filter>
</ClCompile>
Expand All @@ -1460,6 +1478,9 @@
<ClCompile Include="skills/thief/hiding.cpp">
<Filter>Source Files\Skills\Thief</Filter>
</ClCompile>
<ClCompile Include="skills/thief/meteorassault.cpp">
<Filter>Source Files\Skills\Thief</Filter>
</ClCompile>
<ClCompile Include="skills/thief/mug.cpp">
<Filter>Source Files\Skills\Thief</Filter>
</ClCompile>
Expand All @@ -1484,6 +1505,9 @@
<ClCompile Include="skills/thief/sonicblow.cpp">
<Filter>Source Files\Skills\Thief</Filter>
</ClCompile>
<ClCompile Include="skills/thief/souldestroyer.cpp">
<Filter>Source Files\Skills\Thief</Filter>
</ClCompile>
<ClCompile Include="skills/thief/steal.cpp">
<Filter>Source Files\Skills\Thief</Filter>
</ClCompile>
Expand Down
8 changes: 8 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 @@ -405,16 +405,19 @@
<ClInclude Include="skills/thief/backstab.hpp" />
<ClInclude Include="skills/thief/cloaking.hpp" />
<ClInclude Include="skills/thief/closeconfine.hpp" />
<ClInclude Include="skills/thief/createdeadlypoison.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/enchantdeadlypoison.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/meteorassault.hpp" />
<ClInclude Include="skills/thief/mug.hpp" />
<ClInclude Include="skills/thief/remover.hpp" />
<ClInclude Include="skills/thief/sandattack.hpp" />
Expand All @@ -423,6 +426,7 @@
<ClInclude Include="skills/thief/skill_factory_thief.hpp" />
<ClInclude Include="skills/thief/snatch.hpp" />
<ClInclude Include="skills/thief/sonicblow.hpp" />
<ClInclude Include="skills/thief/souldestroyer.hpp" />
<ClInclude Include="skills/thief/steal.hpp" />
<ClInclude Include="skills/thief/stonefling.hpp" />
<ClInclude Include="skills/thief/throwvenomknife.hpp" />
Expand Down Expand Up @@ -641,16 +645,19 @@
<ClCompile Include="skills/thief/backstab.cpp" />
<ClCompile Include="skills/thief/cloaking.cpp" />
<ClCompile Include="skills/thief/closeconfine.cpp" />
<ClCompile Include="skills/thief/createdeadlypoison.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/enchantdeadlypoison.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/meteorassault.cpp" />
<ClCompile Include="skills/thief/mug.cpp" />
<ClCompile Include="skills/thief/remover.cpp" />
<ClCompile Include="skills/thief/sandattack.cpp" />
Expand All @@ -659,6 +666,7 @@
<ClCompile Include="skills/thief/skill_factory_thief.cpp" />
<ClCompile Include="skills/thief/snatch.cpp" />
<ClCompile Include="skills/thief/sonicblow.cpp" />
<ClCompile Include="skills/thief/souldestroyer.cpp" />
<ClCompile Include="skills/thief/steal.cpp" />
<ClCompile Include="skills/thief/stonefling.cpp" />
<ClCompile Include="skills/thief/throwvenomknife.cpp" />
Expand Down
24 changes: 24 additions & 0 deletions src/map/map-server.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -864,6 +864,9 @@
<ClInclude Include="skills/thief/closeconfine.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>
Expand All @@ -879,6 +882,9 @@
<ClInclude Include="skills/thief/divestweapon.hpp">
<Filter>Header Files\Skills\Thief</Filter>
</ClInclude>
<ClInclude Include="skills/thief/enchantdeadlypoison.hpp">
<Filter>Header Files\Skills\Thief</Filter>
</ClInclude>
<ClInclude Include="skills/thief/enchantpoison.hpp">
<Filter>Header Files\Skills\Thief</Filter>
</ClInclude>
Expand All @@ -894,6 +900,9 @@
<ClInclude Include="skills/thief/hiding.hpp">
<Filter>Header Files\Skills\Thief</Filter>
</ClInclude>
<ClInclude Include="skills/thief/meteorassault.hpp">
<Filter>Header Files\Skills\Thief</Filter>
</ClInclude>
<ClInclude Include="skills/thief/mug.hpp">
<Filter>Header Files\Skills\Thief</Filter>
</ClInclude>
Expand All @@ -918,6 +927,9 @@
<ClInclude Include="skills/thief/sonicblow.hpp">
<Filter>Header Files\Skills\Thief</Filter>
</ClInclude>
<ClInclude Include="skills/thief/souldestroyer.hpp">
<Filter>Header Files\Skills\Thief</Filter>
</ClInclude>
<ClInclude Include="skills/thief/steal.hpp">
<Filter>Header Files\Skills\Thief</Filter>
</ClInclude>
Expand Down Expand Up @@ -1430,6 +1442,9 @@
<ClCompile Include="skills/thief/closeconfine.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>
Expand All @@ -1445,6 +1460,9 @@
<ClCompile Include="skills/thief/divestweapon.cpp">
<Filter>Source Files\Skills\Thief</Filter>
</ClCompile>
<ClCompile Include="skills/thief/enchantdeadlypoison.cpp">
<Filter>Source Files\Skills\Thief</Filter>
</ClCompile>
<ClCompile Include="skills/thief/enchantpoison.cpp">
<Filter>Source Files\Skills\Thief</Filter>
</ClCompile>
Expand All @@ -1460,6 +1478,9 @@
<ClCompile Include="skills/thief/hiding.cpp">
<Filter>Source Files\Skills\Thief</Filter>
</ClCompile>
<ClCompile Include="skills/thief/meteorassault.cpp">
<Filter>Source Files\Skills\Thief</Filter>
</ClCompile>
<ClCompile Include="skills/thief/mug.cpp">
<Filter>Source Files\Skills\Thief</Filter>
</ClCompile>
Expand All @@ -1484,6 +1505,9 @@
<ClCompile Include="skills/thief/sonicblow.cpp">
<Filter>Source Files\Skills\Thief</Filter>
</ClCompile>
<ClCompile Include="skills/thief/souldestroyer.cpp">
<Filter>Source Files\Skills\Thief</Filter>
</ClCompile>
<ClCompile Include="skills/thief/steal.cpp">
<Filter>Source Files\Skills\Thief</Filter>
</ClCompile>
Expand Down
36 changes: 0 additions & 36 deletions src/map/skill.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1597,20 +1597,6 @@ int32 skill_additional_effect( block_list* src, block_list *bl, uint16 skill_id,
sc_start2(src,bl, SC_BLEEDING,50, skill_lv, src->id, skill_get_time2(skill_id,skill_lv));
break;

case ASC_METEORASSAULT:
//Any enemies hit by this skill will receive Stun, Darkness, or external bleeding status ailment with a 5%+5*skill_lv% chance.
switch(rnd()%3) {
case 0:
sc_start(src,bl,SC_BLIND,(5+skill_lv*5),skill_lv,skill_get_time2(skill_id,1));
break;
case 1:
sc_start(src,bl,SC_STUN,(5+skill_lv*5),skill_lv,skill_get_time2(skill_id,2));
break;
default:
sc_start2(src,bl,SC_BLEEDING,(5+skill_lv*5),skill_lv,src->id,skill_get_time2(skill_id,3));
}
break;

case HW_NAPALMVULCAN:
case HN_NAPALM_VULCAN_STRIKE:
sc_start(src,bl,SC_CURSE,5*skill_lv,skill_lv,skill_get_time2(skill_id,skill_lv));
Expand Down Expand Up @@ -5345,7 +5331,6 @@ int32 skill_castend_damage_id (block_list* src, block_list *bl, uint16 skill_id,
#endif
case HW_NAPALMVULCAN:
case NJ_HUUMA:
case ASC_METEORASSAULT:
case NPC_PULSESTRIKE:
case NPC_PULSESTRIKE2:
case NPC_HELLJUDGEMENT:
Expand Down Expand Up @@ -7862,17 +7847,6 @@ int32 skill_castend_nodamage_id (block_list *src, block_list *bl, uint16 skill_i
clif_skill_damage( *src, *bl, tick, status_get_amotion(src), 0, DMGVAL_IGNORE, 1, skill_id, skill_lv, DMG_SINGLE );
break;

// EDP also give +25% WATK poison pseudo element to user.
case ASC_EDP:
clif_skill_nodamage(src,*bl,skill_id,skill_lv,
sc_start(src,bl,type,100,skill_lv,skill_get_time(skill_id,skill_lv)));
#ifdef RENEWAL
sc_start4(src, src, SC_SUB_WEAPONPROPERTY, 100, ELE_POISON, 25, skill_id, 0, skill_get_time(skill_id, skill_lv));
#else
sc_start4(src, src, SC_WATK_ELEMENT, 100, ELE_POISON, 25, 0, 0, skill_get_time(skill_id, skill_lv));
#endif
break;

case LG_SHIELDSPELL:
if (skill_lv == 1)
type = SC_SHIELDSPELL_HP;
Expand Down Expand Up @@ -8288,7 +8262,6 @@ int32 skill_castend_nodamage_id (block_list *src, block_list *bl, uint16 skill_i
break;

//List of self skills that give damage around caster
case ASC_METEORASSAULT:
case RK_WINDCUTTER:
case RK_STORMBLAST:
case NC_AXETORNADO:
Expand Down Expand Up @@ -8864,15 +8837,6 @@ int32 skill_castend_nodamage_id (block_list *src, block_list *bl, uint16 skill_i
unit_warp(bl,-1,-1,-1,CLR_TELEPORT);
break;

case ASC_CDP:
if(sd) {
if(skill_produce_mix(sd, skill_id, ITEMID_POISON_BOTTLE, 0, 0, 0, 1, -1)) //Produce a Poison Bottle.
clif_skill_nodamage(src,*bl,skill_id,skill_lv);
else
clif_skill_fail( *sd, skill_id, USESKILL_FAIL_STUFF_INSUFFICIENT );
}
break;

case ST_FULLSTRIP:
case GC_WEAPONCRUSH:
case SC_STRIPACCESSARY:
Expand Down
21 changes: 21 additions & 0 deletions src/map/skills/thief/createdeadlypoison.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
// Copyright (c) rAthena Dev Teams - Licensed under GNU GPL
// For more information, see LICENCE in the main folder

#include "createdeadlypoison.hpp"

#include "map/clif.hpp"
#include "map/pc.hpp"

SkillCreateDeadlyPoison::SkillCreateDeadlyPoison() : SkillImpl(ASC_CDP) {
}

void SkillCreateDeadlyPoison::castendNoDamageId(block_list *src, block_list *target, uint16 skill_lv, t_tick tick, int32& flag) const {
map_session_data* sd = BL_CAST( BL_PC, src );

if(sd) {
if(skill_produce_mix(sd, getSkillId(), ITEMID_POISON_BOTTLE, 0, 0, 0, 1, -1)) //Produce a Poison Bottle.
clif_skill_nodamage(src,*target,getSkillId(),skill_lv);
else
clif_skill_fail( *sd, getSkillId(), USESKILL_FAIL_STUFF_INSUFFICIENT );
}
}
Loading
Loading