diff options
| author | rud0lp20 <rud0lp20@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-09-13 16:16:08 +0000 |
|---|---|---|
| committer | rud0lp20 <rud0lp20@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-09-13 16:16:08 +0000 |
| commit | e9e4993f8b4d0a8e427a369ded2cd0a45322aac3 (patch) | |
| tree | 1bee5d628620b20c894567e79fd5cdef1f133282 /src/map/skill.c | |
| parent | 7f2dbf6889124f31e19074a6bf185a215459e401 (diff) | |
| download | hercules-e9e4993f8b4d0a8e427a369ded2cd0a45322aac3.tar.gz hercules-e9e4993f8b4d0a8e427a369ded2cd0a45322aac3.tar.bz2 hercules-e9e4993f8b4d0a8e427a369ded2cd0a45322aac3.tar.xz hercules-e9e4993f8b4d0a8e427a369ded2cd0a45322aac3.zip | |
Follow up r16738 MO_ETREMITYFIST renewal behavior.
Fixed bugreport:6580 where SC_MANHOLE targets can use items.
Fixed bugreport:6636 a typo formula in WL_WHITEIMPRISON.
Fixed bugreport:6685 a missing column in skill_cast_db.txt for WL_COMET entry.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16776 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/skill.c')
| -rw-r--r-- | src/map/skill.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/map/skill.c b/src/map/skill.c index 29500b8b0..7937498ea 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -1700,7 +1700,7 @@ int skill_counter_additional_effect (struct block_list* src, struct block_list * switch(skillid){ case MO_EXTREMITYFIST: - sc_start(src,status_skill2sc(skillid),100,skilllv,skill_get_time2(skillid,skilllv)); + sc_start(src,SC_EXTREMITYFIST,100,skilllv,skill_get_time2(skillid,skilllv)); break; case GS_FULLBUSTER: sc_start(src,SC_BLIND,2*skilllv,skilllv,skill_get_time2(skillid,skilllv)); @@ -3634,6 +3634,9 @@ int skill_castend_damage_id (struct block_list* src, struct block_list *bl, int { status_change_end(src, SC_EXPLOSIONSPIRITS, INVALID_TIMER); status_change_end(src, SC_BLADESTOP, INVALID_TIMER); +#ifdef RENEWAL + sc_start(src,SC_EXTREMITYFIST2,100,skilllv,skill_get_time(skillid,skilllv)); +#endif } //Client expects you to move to target regardless of distance { @@ -17497,7 +17500,11 @@ static void skill_readdb(void) sv_readdb(db_path, DBPATH"skill_db.txt" , ',', 17, 17, MAX_SKILL_DB, skill_parse_row_skilldb); sv_readdb(db_path, DBPATH"skill_require_db.txt" , ',', 32, 32, MAX_SKILL_DB, skill_parse_row_requiredb); - sv_readdb(db_path, DBPATH"skill_cast_db.txt" , ',', 7, 8, MAX_SKILL_DB, skill_parse_row_castdb); +#ifdef RENEWAL + sv_readdb(db_path, "re/skill_cast_db.txt" , ',', 8, 8, MAX_SKILL_DB, skill_parse_row_castdb); +#else + sv_readdb(db_path, "re-pre/skill_cast_db.txt" , ',', 7, 7, MAX_SKILL_DB, skill_parse_row_castdb); +#endif sv_readdb(db_path, DBPATH"skill_castnodex_db.txt", ',', 2, 3, MAX_SKILL_DB, skill_parse_row_castnodexdb); sv_readdb(db_path, DBPATH"skill_unit_db.txt" , ',', 8, 8, MAX_SKILL_DB, skill_parse_row_unitdb); |