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

* Just a little correction, INF2_NOLP should not be used anymore since (when? idk) we're using INF3_NOLP

Browse Source
This commit is contained in:
Cahyadi Ramadhan Togihon
2013-10-03 12:07:27 +07:00
parent 9b7eb48fe5
commit 67db4dc252
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/map/skill.c
View File

@@ -15147,7 +15147,7 @@ static int skill_cell_overlap(struct block_list *bl, va_list ap)
return 1;
}
//It deletes everything except traps and barriers
if( (!(skill_get_inf2(unit->group->skill_id)&(INF2_TRAP)) && !(skill_get_inf3(unit->group->skill_id)&(INF2_NOLP)) ) || unit->group->skill_id == WZ_FIREPILLAR ) {
if( (!(skill_get_inf2(unit->group->skill_id)&(INF2_TRAP)) && !(skill_get_inf3(unit->group->skill_id)&(INF3_NOLP)) ) || unit->group->skill_id == WZ_FIREPILLAR ) {
skill_delunit(unit);
return 1;
}
@@ -17973,6 +17973,8 @@ static bool skill_parse_row_skilldb(char* split[], int columns, int current)
skill_split_atoi(split[1],skill_db[idx].range);
skill_db[idx].hit = atoi(split[2]);
skill_db[idx].inf = atoi(split[3]);
if (skill_db[idx].inf&0x02000)
printf("skill_id:%d\n",skill_id);
skill_split_atoi(split[4],skill_db[idx].element);
skill_db[idx].nk = (int)strtol(split[5], NULL, 0);
skill_split_atoi(split[6],skill_db[idx].splash);

10
src/map/skill.h
View File

@@ -65,17 +65,17 @@ enum e_skill_inf2 {
INF2_PARTY_ONLY = 0x00400,
INF2_GUILD_ONLY = 0x00800,
INF2_NO_ENEMY = 0x01000,
INF2_NOLP = 0x02000, // Spells that can ignore Land Protector
//INF2_ = 0x02000, // free
INF2_CHORUS_SKILL = 0x04000, // Chorus skill
INF2_NO_BG_DMG = 0x08000, // spell that ignore bg reduction
INF2_NO_GVG_DMG = 0x10000, // spell that ignore gvg reduction
INF2_NO_NEARNPC = 0x20000, // disable cast skill if near with NPC [Cydh]
INF2_NO_NEARNPC = 0x20000, // disable to cast skill if near with NPC [Cydh]
};
/// Skill info type 3
enum e_skill_inf3 {
INF3_NOLP = 0x0001, // Spells that can ignore Land Protector
INF3_NOENDCAMOUFLAGE = 0x0002, // spell that doesn't end camouflage
INF3_NOLP = 0x0001, // Spells that can ignore Land Protector
INF3_NOENDCAMOUFLAGE = 0x0002, // spell that doesn't end camouflage
INF3_USABLE_HIDING = 0x0004, // spell that can be use in hiding
INF3_USABLE_DANCE = 0x0008, // spell that can be use while in dancing state
INF3_HIT_EMP = 0x0010, // spell that could hit emperium
@@ -85,7 +85,7 @@ enum e_skill_inf3 {
INF3_EFF_SNAKEEYE = 0x0100, // spell range affected by GS_SNAKEEYE
INF3_EFF_SHADOWJUMP = 0x0200, // spell range affected by NJ_SHADOWJUMP
INF3_EFF_RADIUS = 0x0400, // spell range affected by WL_RADIUS
INF3_EFF_RESEARCHTRAP = 0x0800, // spell range affected by RA_RESEARCHTRAP
INF3_EFF_RESEARCHTRAP = 0x0800, // spell range affected by RA_RESEARCHTRAP
INF3_DIS_PLAGIA = 0x1000, // spell that can't be copied
INF3_USABLE_WARG = 0x2000, // spell that can be use while riding warg
INF3_DIS_MADO = 0x4000, // spell that can't be used while in mado