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

Hindsight, Song/Dance Effect fixes

Browse Source 
- Fixed Hindsight often casting level 0 of a skill when the selected auto-skill was of level 2
- Fixed song and dance effects staying forever on the screen if the bard / dancer walked out of sight (fixed #127)
This commit is contained in:
Playtester 2014-11-24 21:11:09 +01:00
parent a16701f33a
commit 76a30f3927
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/map/battle.c
View File

@ -6908,7 +6908,7 @@ enum damage_lv battle_weapon_attack(struct block_list* src, struct block_list* t
i = 0; //Max chance, no skill_lv reduction. [Skotlex] i = 0; //Max chance, no skill_lv reduction. [Skotlex]
//reduction only for skill_lv > 1 //reduction only for skill_lv > 1
if (skill_lv > 1) { if (skill_lv > 1) {
if (i >= 50) skill_lv -= 2; if (i >= 50) skill_lv /= 2;
else if (i >= 15) skill_lv--; else if (i >= 15) skill_lv--;
} }
sp = skill_get_sp(skill_id,skill_lv) * 2 / 3; sp = skill_get_sp(skill_id,skill_lv) * 2 / 3;

5
src/map/skill.c
View File

@ -17817,16 +17817,21 @@ void skill_unit_move_unit_group(struct skill_unit_group *group, int16 m, int16 d
switch(m_flag[i]) { switch(m_flag[i]) {
case 0: case 0:
//Cell moves independently, safely move it. //Cell moves independently, safely move it.
map_foreachinmovearea(clif_outsight, &unit1->bl, AREA_SIZE, dx, dy, BL_PC, &unit1->bl);
map_moveblock(&unit1->bl, unit1->bl.x+dx, unit1->bl.y+dy, tick); map_moveblock(&unit1->bl, unit1->bl.x+dx, unit1->bl.y+dy, tick);
break; break;
case 1: case 1:
//Cell moves unto another cell, look for a replacement cell that won't collide //Cell moves unto another cell, look for a replacement cell that won't collide
//and has no cell moving into it (flag == 2) //and has no cell moving into it (flag == 2)
for(; j < group->unit_count; j++) { for(; j < group->unit_count; j++) {
int dx2, dy2;
if(m_flag[j] != 2 || !group->unit[j].alive) if(m_flag[j] != 2 || !group->unit[j].alive)
continue; continue;
//Move to where this cell would had moved. //Move to where this cell would had moved.
unit2 = &group->unit[j]; unit2 = &group->unit[j];
dx2 = unit2->bl.x + dx - unit1->bl.x;
dy2 = unit2->bl.y + dy - unit1->bl.y;
map_foreachinmovearea(clif_outsight, &unit1->bl, AREA_SIZE, dx2, dy2, BL_PC, &unit1->bl);
map_moveblock(&unit1->bl, unit2->bl.x+dx, unit2->bl.y+dy, tick); map_moveblock(&unit1->bl, unit2->bl.x+dx, unit2->bl.y+dy, tick);
j++; //Skip this cell as we have used it. j++; //Skip this cell as we have used it.
break; break;