- 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, 13 insertions, 21 deletions

diff --git a/src/map/pet.c b/src/map/pet.c
index 5d80f978d..9177440d4 100644
--- a/src/map/pet.c
+++ b/src/map/pet.c
@@ -318,32 +318,27 @@ static int petskill_castend(struct pet_data *pd,unsigned int tick,int data)
  */

 static int petskill_castend2(struct pet_data *pd, struct block_list *target, short skill_id, short skill_lv, short skill_x, short skill_y, unsigned int tick)

 {	//Invoked after the casting time has passed.

-	short delaytime =0;

+	int delaytime =0;

 

 	nullpo_retr(0, pd);

 

 	pd->state.state=MS_IDLE;

 	

-	if (skill_get_inf(skill_id) & INF_GROUND_SKILL)

+	if (skill_get_inf(skill_id)&INF_GROUND_SKILL)

 	{	//Area skill

 		skill_castend_pos2(&pd->bl, skill_x, skill_y, skill_id, skill_lv, tick,0);

 	} else { //Targeted Skill

-		if (!target || !status_check_skilluse(&pd->bl, target, skill_id, 1))

+	  	if (!target)

 			return 0; 

-		//Skills with inf = 4 (cast on self) have view range (assumed party skills)

 		if(!check_distance_bl(&pd->bl, target,

-			(skill_get_inf(skill_id) & INF_SELF_SKILL?battle_config.area_size:skill_get_range2(&pd->bl, skill_id, skill_lv))))

+				skill_get_range2(&pd->bl, skill_id, skill_lv)));

 			return 0;

-		switch( skill_get_nk(skill_id) )

-		{

-			case NK_NO_DAMAGE:

-				skill_castend_nodamage_id(&pd->bl,target, skill_id, skill_lv,tick, 0);

-				break;

-			case NK_SPLASH_DAMAGE:

-			default:

-				skill_castend_damage_id(&pd->bl,target,skill_id,skill_lv,tick,0);

-				break;

-		}

+		if (!status_check_skilluse(&pd->bl, target, skill_id, 1))

+			return 0;

+		if (skill_get_casttype(skill_id) == CAST_NODAMAGE)

+			skill_castend_nodamage_id(&pd->bl, target, skill_id, skill_lv, tick, 0);

+		else

+			skill_castend_damage_id(&pd->bl, target, skill_id, skill_lv, tick,0);

 	}

 

 	if (pd->timer != -1) //The above skill casting could had changed the state (Abracadabra?)

@@ -1460,12 +1455,9 @@ static int pet_ai_sub_hard(struct pet_data *pd,unsigned int tick)
 		return 0;

 	// ペットによるルート

 	if(!pd->target_id && pd->loot && pd->loot->count < pd->loot->max && DIFF_TICK(gettick(),pd->loot->timer)>0)

-		map_foreachinarea(pet_ai_sub_hard_lootsearch,pd->bl.m,

-						  pd->bl.x-6,pd->bl.y-6, //If pet_ai_sub_hard_lootsearch limits itself to a range of 5, WHY use AREA_SIZE here? o.O [Skotlex]

-						  pd->bl.x+6,pd->bl.y+6,

-//						  pd->bl.x-AREA_SIZE*2,pd->bl.y-AREA_SIZE*2,

-//						  pd->bl.x+AREA_SIZE*2,pd->bl.y+AREA_SIZE*2,

-						  BL_ITEM,pd,&i);

+		//Use half the pet's range of sight.

+		map_foreachinrange(pet_ai_sub_hard_lootsearch,&pd->bl,

+			pd->db->range2/2, BL_ITEM,pd,&i);

 

 	if(sd->pet.intimate > 0) {

 		dist = distance_bl(&sd->bl, &pd->bl);