Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Modified trap related code so it behaves as explained by Playtester: Traps trigger on everyone in their 'effect range' (skill_db's splash) for every target that lies within its trigger range at trigger time (range and interval in the skill_unit_db).

Browse Source 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11634 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
skotlex 2007-11-02 01:19:38 +00:00
parent 675f48c26f
commit 856a3dc17c
2 changed files with 11 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Changelog-Trunk.txt
View File

@ -3,6 +3,11 @@ Date Added
AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK. AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK.
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
2007/11/02
* Modified trap related code so it behaves as explained by Playtester:
Traps trigger on everyone in their 'effect range' (skill_db's splash) for
every target that lies within its trigger range at trigger time (range and
interval in the skill_unit_db). [Skotlex]
2007/11/01 2007/11/01
* Removed code that queues OnAgitEliminate after the Emperium is broken, * Removed code that queues OnAgitEliminate after the Emperium is broken,
this is now done properly by the gvg script instead [ultramage] this is now done properly by the gvg script instead [ultramage]

25
src/map/skill.c
View File

@ -7475,17 +7475,8 @@ int skill_unit_onplace_timer (struct skill_unit *src, struct block_list *bl, uns
break; break;
case UNT_LANDMINE: case UNT_LANDMINE:
skill_attack(BF_MISC,ss,&src->bl,bl,sg->skill_id,sg->skill_lv,tick,0);
sg->unit_id = UNT_USED_TRAPS;
clif_changetraplook(&src->bl, UNT_FIREPILLAR_ACTIVE);
sg->limit=DIFF_TICK(tick,sg->tick)+1500;
break;
case UNT_CLAYMORETRAP: case UNT_CLAYMORETRAP:
case UNT_BLASTMINE: case UNT_BLASTMINE:
//Hold number of targets (required for damage calculation)
type = map_foreachinrange(skill_count_target,&src->bl,
skill_get_splash(sg->skill_id, sg->skill_lv), sg->bl_flag, &src->bl);
case UNT_SHOCKWAVE: case UNT_SHOCKWAVE:
case UNT_SANDMAN: case UNT_SANDMAN:
case UNT_FLASHER: case UNT_FLASHER:
@ -7493,8 +7484,8 @@ int skill_unit_onplace_timer (struct skill_unit *src, struct block_list *bl, uns
map_foreachinrange(skill_trap_splash,&src->bl, map_foreachinrange(skill_trap_splash,&src->bl,
skill_get_splash(sg->skill_id, sg->skill_lv), sg->bl_flag, skill_get_splash(sg->skill_id, sg->skill_lv), sg->bl_flag,
&src->bl,tick,type); &src->bl,tick,type);
sg->unit_id = UNT_USED_TRAPS; clif_changetraplook(&src->bl, sg->unit_id==UNT_LANDMINE?UNT_FIREPILLAR_ACTIVE:UNT_USED_TRAPS);
clif_changetraplook(&src->bl, UNT_USED_TRAPS); src->range = -1; //Disable range so it does not invoke a for each in area again.
sg->limit=DIFF_TICK(tick,sg->tick)+1500; sg->limit=DIFF_TICK(tick,sg->tick)+1500;
break; break;
@ -9715,11 +9706,9 @@ int skill_trap_splash (struct block_list *bl, va_list ap)
struct skill_unit *unit; struct skill_unit *unit;
struct skill_unit_group *sg; struct skill_unit_group *sg;
struct block_list *ss; struct block_list *ss;
int i,count;
src = va_arg(ap,struct block_list *); src = va_arg(ap,struct block_list *);
unit = (struct skill_unit *)src; unit = (struct skill_unit *)src;
tick = va_arg(ap,int); tick = va_arg(ap,int);
count = va_arg(ap,int);
nullpo_retr(0, sg = unit->group); nullpo_retr(0, sg = unit->group);
nullpo_retr(0, ss = map_id2bl(sg->src_id)); nullpo_retr(0, ss = map_id2bl(sg->src_id));
@ -9735,13 +9724,8 @@ int skill_trap_splash (struct block_list *bl, va_list ap)
break; break;
case UNT_BLASTMINE: case UNT_BLASTMINE:
case UNT_CLAYMORETRAP: case UNT_CLAYMORETRAP:
//Special property: Each target is hit N times (N = number of targets on splash area)
if (!count) count = 1;
for(i=0;i<count;i++)
skill_attack(BF_MISC,ss,src,bl,sg->skill_id,sg->skill_lv,tick,0);
break;
case UNT_FREEZINGTRAP: case UNT_FREEZINGTRAP:
skill_attack(BF_WEAPON,ss,src,bl,sg->skill_id,sg->skill_lv,tick,0); skill_attack(skill_get_type(sg->skill_id),ss,src,bl,sg->skill_id,sg->skill_lv,tick,0);
break; break;
case UNT_GROUNDDRIFT_WIND: case UNT_GROUNDDRIFT_WIND:
if(skill_attack(BF_WEAPON,ss,src,bl,sg->skill_id,sg->skill_lv,tick,sg->val1)) if(skill_attack(BF_WEAPON,ss,src,bl,sg->skill_id,sg->skill_lv,tick,sg->val1))
@ -10233,6 +10217,9 @@ int skill_unit_timer_sub (struct block_list* bl, va_list ap)
else else
map_foreachinrange(skill_unit_timer_sub_onplace, bl, unit->range, group->bl_flag, bl,tick); map_foreachinrange(skill_unit_timer_sub_onplace, bl, unit->range, group->bl_flag, bl,tick);
if(unit->range == -1) //Unit disabled, but it should not be deleted yet.
group->unit_id = UNT_USED_TRAPS;
if( !unit->alive ) if( !unit->alive )
{ {
if( dissonance ) skill_dance_switch(unit, 1); if( dissonance ) skill_dance_switch(unit, 1);