- Added NK value 3: No damage + area of effect skill (NK_SPLASH_NO_DAMAGE)

- Removed the double-cast specific code and made it use skill_addtimerskill instead.
- Modified party_foreachsamemap so that it returns to addition of the return value of the functions invoked. Type has been changed for "range", when 0, it scans all party members in the map.
- Updated most skill/battle code to use map_foreachinrange rather than map_foreachinarea.
- map_foreachinrange does not performs an exact range check anymore. However the relevant code is commented and anyone can enable it.
- Updated most skills to use skill_get_splash instead of hardcoded ranges.
- Added function skill_get_casttype which returns the type of function that should be invoked for that skill: skill_castend_pos, skill_castend_nodamage_id or skill_castend_damage_id.
- self skills are sent to skill_castend_nodamage_id regardless of nk (nk should signal if the skill causes damage above everything, it is used on autospell/effects).
- Due to the previous change, self skills where the target and src are different, and don't have an nk of no damage, they are sent to castend_damage_id (assumed target auto-selected skills)
- Applied the relevant updates to db/skill_db.txt, db/skill_unit_db also got updated, as trap ranges should all be 1, the splash damage range is defined now in skill_db
- Cleaned up the implementation of the code related to Gangster's paradise and TK_HP/SPtime


git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@5313 54d463be-8e91-2dee-dedb-b68131a5f0ec

1 files changed, 10 insertions, 5 deletions

diff --git a/src/map/skill.h b/src/map/skill.h
index 5035c8766..d18e2e59e 100644
--- a/src/map/skill.h
+++ b/src/map/skill.h
@@ -23,9 +23,9 @@
 

 //Constants to identify a skill's nk value.

 //The NK value applies only to non INF_GROUND_SKILL skills.

-#define NK_NO_DAMAGE 1

-#define NK_SPLASH_DAMAGE 2

-

+#define NK_NO_DAMAGE 0x1

+#define NK_SPLASH 0x2

+//A skill with 3 would be no damage + splash: area of effect.

 //Constants to identify a skill's inf2 value.

 #define INF2_QUEST_SKILL 1

 //NPC skills are those that players can't have in their skill tree.

@@ -130,14 +130,19 @@ struct skill_unit_group;
 

 int do_init_skill(void);

 

+

+//Returns the cast type of the skill: ground cast, castend damage, castend no damage

+enum { CAST_GROUND, CAST_DAMAGE, CAST_NODAMAGE };

+int skill_get_casttype(int id); //[Skotlex]

 // スキルデ?タベ?スへのアクセサ

 int	skill_get_hit( int id );

 int	skill_get_inf( int id );

 int	skill_get_pl( int id );

 int	skill_get_nk( int id );

 int	skill_get_max( int id );

-int skill_get_range( int id , int lv );

-int skill_get_range2(struct block_list *bl, int id, int lv);

+int	skill_get_range( int id , int lv );

+int	skill_get_range2(struct block_list *bl, int id, int lv);

+int	skill_get_splash( int id , int lv );

 int	skill_get_hp( int id ,int lv );

 int	skill_get_mhp( int id ,int lv );

 int	skill_get_sp( int id ,int lv );