diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-02-09 14:43:35 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-02-09 14:43:35 +0000 |
| commit | 3e8fdb1e9d8591db80b24999595d2c70a004dce1 (patch) | |
| tree | 8bc239f39a08938a31c8002502570044f4aa157e | |
| parent | 173c3195ade5a6cdfe20c49e7f184a6b1336ca19 (diff) | |
| download | hercules-3e8fdb1e9d8591db80b24999595d2c70a004dce1.tar.gz hercules-3e8fdb1e9d8591db80b24999595d2c70a004dce1.tar.bz2 hercules-3e8fdb1e9d8591db80b24999595d2c70a004dce1.tar.xz hercules-3e8fdb1e9d8591db80b24999595d2c70a004dce1.zip | |
- Changed the default of skill_delay_attack_enable to no.
- Modified Magnum break's delay to 0, time1 to 2 secs, time2 to 10 secs. Time 1 is for the skill reuse delay, and time2 the weapon fire bonus time.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@5236 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | Changelog-Trunk.txt | 1 | ||||
| -rw-r--r-- | conf-tmpl/battle/skill.conf | 2 | ||||
| -rw-r--r-- | db/Changelog.txt | 4 | ||||
| -rw-r--r-- | db/skill_cast_db.txt | 2 | ||||
| -rw-r--r-- | src/map/skill.c | 3 |
5 files changed, 9 insertions, 3 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index c33c2c9f0..126b69236 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -6,6 +6,7 @@ GOES INTO TRUNK AND WILL BE MERGED INTO STABLE BY VALARIS AND WIZPUTER. -- VALAR 2006/02/09
+ * Changed the default of skill_delay_attack_enable to no. [Skotlex]
* Code rewrites in mob_damage and party_exp_even_share for correctly
handling overflow issues. Now uses UINT_MAX for range comparisons, as it
should be. [Skotlex]
diff --git a/conf-tmpl/battle/skill.conf b/conf-tmpl/battle/skill.conf index ce2f334d2..ca67ff0f3 100644 --- a/conf-tmpl/battle/skill.conf +++ b/conf-tmpl/battle/skill.conf @@ -45,7 +45,7 @@ min_skill_delay_limit: 100 castrate_dex_scale: 150 // Will normal attacks be able to ignore the delay after skills? (Note 1) -skill_delay_attack_enable: yes +skill_delay_attack_enable: no // Range added to player skills after their cast time finishes. // Decides how far away the target can walk away after the skill began casting before the skill fails. diff --git a/db/Changelog.txt b/db/Changelog.txt index 567b292ad..3c8710583 100644 --- a/db/Changelog.txt +++ b/db/Changelog.txt @@ -29,6 +29,10 @@ =========================
+02/09
+ * Modified Magnum break's delay to 0, time1 to 2 secs, time2 to 10 secs.
+ Time 1 is for the skill reuse delay, and time2 the weapon fire bonus time.
+ [Skotlex]
02/06
* Changed Serin's Gold Ring Weight to 0 [Poki#3]
diff --git a/db/skill_cast_db.txt b/db/skill_cast_db.txt index ce39f6bbd..80707d479 100644 --- a/db/skill_cast_db.txt +++ b/db/skill_cast_db.txt @@ -34,7 +34,7 @@ //-- SM_PROVOKE
6,0,0,30000,0
//-- SM_MAGNUM
-7,0,2000,0,0
+7,0,0,2000,10000
//-- SM_ENDURE
8,0,0,10000:13000:16000:19000:22000:25000:28000:31000:34000:37000,0
//==========================================
diff --git a/src/map/skill.c b/src/map/skill.c index 44e78e51f..b33211759 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -2819,8 +2819,9 @@ int skill_castend_damage_id (struct block_list* src, struct block_list *bl,int s src->m,src->x-2,src->y-2,src->x+2,src->y+2,BL_CHAR,
src,skillid,skilllv,tick, flag|BCT_ENEMY|1,
skill_castend_damage_id);
- status_change_start (src,SC_WATK_ELEMENT,100,3,20,0,0,10000,0); //Initiate 10% of your damage becomes fire element.
+ status_change_start (src,SC_WATK_ELEMENT,100,3,20,0,0,skill_get_time2(skillid, skilllv),0); //Initiate 10% of your damage becomes fire element.
clif_skill_nodamage (src,src,skillid,skilllv,1);
+ if (sd) pc_blockskill_start (sd, skillid, skill_get_time(skillid, skilllv));
}
break;
|