diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-10-25 13:34:43 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-10-25 13:34:43 +0000 |
| commit | 25e3d584866b386b37232320457e6cf1bdcf3d87 (patch) | |
| tree | 9cb3f303013ba7f0aa72bf6fd4c2837c963f8d24 /src/map | |
| parent | 526698e336a4d13c61a20e9fbf26c04a919c2950 (diff) | |
| download | hercules-25e3d584866b386b37232320457e6cf1bdcf3d87.tar.gz hercules-25e3d584866b386b37232320457e6cf1bdcf3d87.tar.bz2 hercules-25e3d584866b386b37232320457e6cf1bdcf3d87.tar.xz hercules-25e3d584866b386b37232320457e6cf1bdcf3d87.zip | |
- MG_STONECURSE and NPC_PETRIFYATTACK now use time1 to specify the "petrifying time". This value has been set to 5 seconds.
- Now when SC_STONE is triggered from status-change cards, it's petrifying duration will be passed as 0, causing the minimum (1 sec) to be used.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9066 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map')
| -rw-r--r-- | src/map/pc.c | 1 | ||||
| -rw-r--r-- | src/map/skill.c | 10 | ||||
| -rw-r--r-- | src/map/status.c | 4 |
3 files changed, 11 insertions, 4 deletions
diff --git a/src/map/pc.c b/src/map/pc.c index 98d581980..4a90929ea 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -3149,7 +3149,6 @@ int pc_show_steal(struct block_list *bl,va_list ap) { struct map_session_data *sd; int itemid; - int type; struct item_data *item=NULL; char output[100]; diff --git a/src/map/skill.c b/src/map/skill.c index fb5dd2042..2f337492b 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -1214,13 +1214,17 @@ int skill_additional_effect (struct block_list* src, struct block_list *bl, int break; case NPC_PETRIFYATTACK: + sc_start4(bl,SkillStatusChangeTable(skillid),50+10*skilllv, + skilllv,0,0,skill_get_time(skillid,skilllv), + skill_get_time2(skillid,skilllv)); + break; case NPC_CURSEATTACK: case NPC_SLEEPATTACK: case NPC_BLINDATTACK: case NPC_POISON: case NPC_SILENCEATTACK: case NPC_STUNATTACK: - sc_start(bl,SkillStatusChangeTable(skillid),50+10*skilllv,skilllv,src->type==BL_PET?skilllv*1000:skill_get_time2(skillid,skilllv)); + sc_start(bl,SkillStatusChangeTable(skillid),50+10*skilllv,skilllv,skill_get_time2(skillid,skilllv)); break; case NPC_MENTALBREAKER: @@ -4227,7 +4231,9 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in if (sd) clif_skill_fail(sd,skillid,0,0); break; } - if (sc_start(bl,SC_STONE,(skilllv*4+20),skilllv,skill_get_time2(skillid,skilllv))) + if (sc_start4(bl,SC_STONE,(skilllv*4+20), + skilllv, 0, 0, skill_get_time(skillid, skilllv), + skill_get_time2(skillid,skilllv))) clif_skill_nodamage(src,bl,skillid,skilllv,1); else if(sd) { clif_skill_fail(sd,skillid,0,0); diff --git a/src/map/status.c b/src/map/status.c index 26e13b401..126ee5ae1 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -4993,7 +4993,9 @@ int status_change_start(struct block_list *bl,int type,int rate,int val1,int val if (!val2) val2 = 1;
val3 = tick/1000; //Petrified HP-damage iterations.
if(val3 < 1) val3 = 1;
- tick = 5000; //Petrifying time.
+ tick = val4; //Petrifying time.
+ if (tick < 1000)
+ tick = 1000; //Min time
calc_flag = 0; //Actual status changes take effect on petrified state.
break;
|