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

Added unit flag UF_CRAZYWEED_IMMUNE

Browse Source 
* Follow up to 6e97762.
* Used to make unit skills immune to Crazy Vine's removal effect.
This commit is contained in:
aleos89 2016-11-03 21:54:04 -04:00
parent 6e9776203a
commit 805f11d9f0
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
db/pre-re/skill_unit_db.txt
View File

@ -20,7 +20,7 @@
// 0x00800(UF_DUALMODE) Spell has effects both at an interval and when you step in/out
// 0x01000(UF_NOKNOCKBACK) Cannot be knocked back (only unit that can be damaged)
// 0x02000(UF_RANGEDSINGLEUNIT) Layout hack, use layout range propriety but only display center.
// 0x04000(UF_NONE) Free
// 0x04000(UF_CRAZYWEED_IMMUNE) Immune to GN_CRAZYWEED removal
// 0x08000(UF_REM_FIRERAIN) Removed if be overlapped by RL_FIRE_RAIN
// 0x10000(UF_KNOCKBACK_GROUP) Knock back a whole skill group (by default, skill unit is knocked back each unit)
// 0x20000(UF_HIDDEN_TRAP) Hidden trap, see 'traps_setting' skill config to enable this flag

2
db/re/skill_unit_db.txt
View File

@ -20,7 +20,7 @@
// 0x00800(UF_DUALMODE) Spell has effects both at an interval and when you step in/out
// 0x01000(UF_NOKNOCKBACK) Cannot be knocked back (only unit that can be damaged)
// 0x02000(UF_RANGEDSINGLEUNIT) Layout hack, use layout range propriety but only display center.
// 0x04000(UF_NONE) Free
// 0x04000(UF_CRAZYWEED_IMMUNE) Immune to GN_CRAZYWEED removal
// 0x08000(UF_REM_FIRERAIN) Removed if be overlapped by RL_FIRE_RAIN
// 0x10000(UF_KNOCKBACK_GROUP) Knock back a whole skill group (by default, skill unit is knocked back each unit)
// 0x20000(UF_HIDDEN_TRAP) Hidden trap, see 'traps_setting' skill config to enable this flag

4
src/map/skill.c
View File

@ -17127,9 +17127,11 @@ static int skill_cell_overlap(struct block_list *bl, va_list ap)
return 1;
}
break;
case GN_CRAZYWEED_ATK:
if (skill_get_unit_flag(unit->group->skill_id)&UF_CRAZYWEED_IMMUNE)
break;
case HW_GANBANTEIN:
case LG_EARTHDRIVE:
case GN_CRAZYWEED_ATK:
// Officially songs/dances are removed
skill_delunit(unit);
return 1;

2
src/map/skill.h
View File

@ -322,7 +322,7 @@ enum e_skill_unit_flag {
UF_DUALMODE = 0x00800, // Spells should trigger both ontimer and onplace/onout/onleft effects.
UF_NOKNOCKBACK = 0x01000, // Skill unit cannot be knocked back
UF_RANGEDSINGLEUNIT = 0x02000, // hack for ranged layout, only display center
UF_FREE = 0x04000, // Free
UF_CRAZYWEED_IMMUNE = 0x04000, // Immune to Crazy Weed removal
UF_REM_FIRERAIN = 0x08000, // removed by Fire Rain
UF_KNOCKBACK_GROUP = 0x10000, // knockback skill unit with its group instead of single unit
UF_HIDDEN_TRAP = 0x20000, // Hidden trap [Cydh]