- Added structure status_data which holds status-related information (str, agi, etc, speed, amotion, adelay, dmotion, weapon-damage, race, size, etc) and weapon_atk structure with the weapon specific info (atk, atk2, element) to be used by all combat structures (TODO: Homun needs to be updated to use it)

- Cleaned up TBL_PC, TBL_MOB, TBL_PC and mob_db structures to use status_data.
- Set the NPC-Change Attribute duration on Time1, updated their max to 1 in the db.
- Berserk's HP cost interval is now defined as time2.
- Split damage received functions into pc_damage/pc_dead and mob_damage/mob_dead
- Rewrote the @heal related functions to use the new status_* healing functions.
- Added status functions to deal with damage and healing (status_damage, status_heal, status_percent_change) and a bunch of defines for easier handling of them (status_percent_heal, status_percent_damage, status_fix_damage, status_kill, etc)
- Splitted mob_once_spawn into two. mob_once_spawn_sub creates the mob instance without spawning it.
- Added defines for Elements (ELE_*)
- Modified battle_calc_(weapon/magic/misc)_attack to use the status data structure.
- Rewrote and cleaned up battle_calc_misc_attack
- Merged config options pc_attack_attr_none, mob_attack_attr_none, pet_attack_attr_none into attack_attr_none (type 4)
- Removed config options player_defense_type, monster_defense_type, pet_defense_type in favor of weapon_defense_type
- Cleaned up pet.c to stop invoking status_calc_pc when unnecessary
- Modified skill_calc_heal to take into account the MEDITATION bonus.
- Cleaned up code of Adjustment, Madness Cancel and other GS/NJ skills inside skill_check_condition
- Added status change SC_MODECHANGE which handles mob state changes (this SC is continous until manually ended, eg: like Weight50)
- Modified Slim Pitcher so it will work when casted by non-players. Will now also work with SP-healing items.
- Rewrote Freedom of Cast code to use function status_freecast_switch to switch adelay/speed when cast begins/ends.
- Modified Magic Power to store amplified MATK/MATK2 in val3/val4 for easier updating when used in conjunction with ground skills.
- Fixed Asura Strike being usable from within a combo regardless of combo skill.
- Modifed SC_DANCING to store speed-change in val3 (it is shared with skill duration...)
- Added StatusChangeFlagTable to store which statuses are changed by each SC
- Added SCB_* constants to specify the different stats that each sc changes. SCB_PC is the only one that means a change hardcoded in status_calc_pc, the rest are handled by status_calc_bl
- Added some helper functions to simplify with basic status calculations (status_base_atk, status_calc_misc, status_base_pc_maxhp, status_base_pc_maxsp)
- Added status_calc_mob which calculates initial status and special base status alterations (HP changes, stat changes due to big/small mobs, etc)
- Made all the status_calc functions static.
- Added status_calc_bl_sub_pc for PC related calculations that must happen after status-change adjustments.
- Added status_calc_bl which does status-change related calculations using as base the base_status of the bl object and the SCB_* flag passed.
- Added status_get_status_data and status_get_base_status to retrieve the bl objects current status_data and basic status_data (current never returns null, instead it returns a dummy structure with basic data)
- The main switch in status_change_start now only sets the tick and val values, therefore it is skipped when loading (flag&4)
- Cleaned up status_change_start and replaced many of the ex-japanese comments for english ones.
- Changed Hiding to store the speed penalty on val3. val4 stores interval SP cost.
- Changed Chase Walk to store Speed adjustment on val3, sp cost in val4
- Changed Cloaking to store speed penalty on val3, val4&2 signals wall-present, val4&1 is infinite cloaking.
- Changed Wind walk to store speed bonus on val3
- Rewrote Marionette Control to store the status to add/substract in val3/val4, it now works on anyone (players/mobs)
- Changed Improve concentration to store Card bonuses (which are not counted for total % increase) on val3/val4
- Changed SC_ADRENALINE, SC_CONCENTRATION, SC_ANGELUS, SC_IMPOSITIO, SC_MELTDOWN, SC_TRUESIGHT, SC_SUN_COMFORT, SC_MOON_COMFORT, SC_STAR_COMFORT, SC_QUAGMIRE, SC_GATLINGFEVER to store the bonus modifiers in their val values rather than calculate them in status_calc_*
- Status_change_start/end will use clif_status_load rather than clif_status_change when related bl is not on a map.
- Modified status_change_timer to use the status_charge function rather than directly substracting SP
- Added SC_ELEMENTALCHANGE to modify someone's base defense element.
- pc_clean_skilltree will now also remove item-granted skills.
- Learning skills will now only invoke status_calc_pc when the skill is passive.
- Cleaned up pc_steal_coin
- Cleaned up pc_check_base/job_lvup to only invoke the lv-up related packets and functions ONCE regardless of skill-levls earned.
- Cleaned up pc_ regen related functions.
- Made player-sprite mobs have item pickup animation and walkdelay when taking items.
- Cleaned up mob_dead code.
- Removed paramb, parame from struct map_session_data, replaced them by param_bonus[6],param_equip[6]
- mob special ai state 3 signals summon flora.
- Moved petDB pet_hungry_timer vars from TBL_PC to TBL_PET
- Cleaned up some pet functions, made the menu functions receive as argument both pet and master.
- Clones will copy a player's base status rather than battle status (so status-change alterations are not cloned)


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

1 files changed, 59 insertions, 57 deletions

diff --git a/src/map/atcommand.c b/src/map/atcommand.c
index c5a9baf50..5274c4225 100644
--- a/src/map/atcommand.c
+++ b/src/map/atcommand.c
@@ -2113,9 +2113,7 @@ int atcommand_speed(
 

 	speed = atoi(message);

 	if (speed >= MIN_WALK_SPEED && speed <= MAX_WALK_SPEED) {

-		sd->speed = speed;

-		//sd->walktimer = x;

-		//‚±‚Ì•¶‚ð’ljÁ by ‚ê‚

+		sd->battle_status.speed = speed;

 		clif_updatestatus(sd, SP_SPEED);

 		clif_displaymessage(fd, msg_table[8]); // Speed changed.

 	} else {

@@ -2381,7 +2379,7 @@ int atcommand_die(
 {

 	nullpo_retr(-1, sd);

 	clif_specialeffect(&sd->bl,450,1);

-	pc_damage(NULL, sd, sd->status.hp);

+	status_kill(&sd->bl);

 	clif_displaymessage(fd, msg_table[13]); // A pity! You've died.

 

 	return 0;

@@ -2407,7 +2405,7 @@ int atcommand_kill(
 

 	if ((pl_sd = map_nick2sd(atcmd_player_name)) != NULL) {

 		if (pc_isGM(sd) >= pc_isGM(pl_sd)) { // you can kill only lower or same level

-			pc_damage(NULL, pl_sd, pl_sd->status.hp);

+			status_kill(&pl_sd->bl);

 			clif_displaymessage(fd, msg_table[14]); // Character killed.

 		} else {

 			clif_displaymessage(fd, msg_table[81]); // Your GM level don't authorise you to do this action on this player.

@@ -2501,37 +2499,46 @@ int atcommand_heal(
 	sscanf(message, "%d %d", &hp, &sp);

 

 	if (hp == 0 && sp == 0) {

-		hp = sd->status.max_hp - sd->status.hp;

-		sp = sd->status.max_sp - sd->status.sp;

-	} else {

-		if (hp > 0 && (hp > sd->status.max_hp || hp > (sd->status.max_hp - sd->status.hp))) // fix positiv overflow

-			hp = sd->status.max_hp - sd->status.hp;

-		else if (hp < 0 && (hp < -sd->status.max_hp || hp < (1 - sd->status.hp))) // fix negativ overflow

-			hp = 1 - sd->status.hp;

-		if (sp > 0 && (sp > sd->status.max_sp || sp > (sd->status.max_sp - sd->status.sp))) // fix positiv overflow

-			sp = sd->status.max_sp - sd->status.sp;

-		else if (sp < 0 && (sp < -sd->status.max_sp || sp < (1 - sd->status.sp))) // fix negativ overflow

-			sp = 1 - sd->status.sp;

-	}

-

-	if (hp > 0) // display like heal

-		clif_heal(fd, SP_HP, hp);

-	else if (hp < 0) // display like damage

+		if (!status_heal(&sd->bl, sd->battle_status.max_hp, sd->battle_status.max_sp, 2))

+			clif_displaymessage(fd, msg_table[157]); // HP and SP are already with the good value.

+		else

+			clif_displaymessage(fd, msg_table[17]); // HP, SP recovered.

+		return 0;

+	}

+	

+	if(hp > 0 && sp >= 0) {

+		if(!status_heal(&sd->bl, hp, sp, 2))

+			clif_displaymessage(fd, msg_table[157]); // HP and SP are already with the good value.

+		else

+			clif_displaymessage(fd, msg_table[17]); // HP, SP recovered.

+		return 0;

+	}

+

+	if(hp < 0 && sp <= 0) {

+		status_damage(NULL, &sd->bl, -hp, -sp, 0, 0);

 		clif_damage(&sd->bl,&sd->bl, gettick(), 0, 0, -hp, 0 , 4, 0);

-	if (sp > 0) // no display when we lost SP

-		clif_heal(fd, SP_SP, sp);

+		clif_displaymessage(fd, msg_table[156]); // HP or/and SP modified.

+		return 0;

+	}

 

-	if (hp != 0 || sp != 0) {

-		pc_heal(sd, hp, sp);

-		if (hp >= 0 && sp >= 0)

-			clif_displaymessage(fd, msg_table[17]); // HP, SP recovered.

+	//Opposing signs.

+	if (hp) {

+		if (hp > 0)

+			status_heal(&sd->bl, hp, 0, 2);

+		else {

+			status_damage(NULL, &sd->bl, -hp, 0, 0, 0);

+			clif_damage(&sd->bl,&sd->bl, gettick(), 0, 0, -hp, 0 , 4, 0);

+		}

+	}

+

+	if (sp) {

+		if (sp > 0)

+			status_heal(&sd->bl, 0, sp, 2);

 		else

-			clif_displaymessage(fd, msg_table[156]); // HP or/and SP modified.

-	} else {

-		clif_displaymessage(fd, msg_table[157]); // HP and SP are already with the good value.

-		return -1;

+			status_damage(NULL, &sd->bl, 0, -sp, 0, 0);

 	}

 

+	clif_displaymessage(fd, msg_table[156]); // HP or/and SP modified.

 	return 0;

 }

 

@@ -2767,7 +2774,7 @@ int atcommand_baselevelup(
 		clif_updatestatus(sd, SP_NEXTBASEEXP);

 		clif_updatestatus(sd, SP_STATUSPOINT);

 		status_calc_pc(sd, 0);

-		pc_heal(sd, sd->status.max_hp, sd->status.max_sp);

+		status_percent_heal(&sd->bl, 100, 100);

 		clif_misceffect(&sd->bl, 0);

 		clif_displaymessage(fd, msg_table[21]); /* Base level raised. */

 	} else {

@@ -3691,7 +3698,7 @@ static int atkillmonster_sub(struct block_list *bl, va_list ap) {
 		return 0; //Do not touch WoE mobs!

 	

 	if (flag)

-		mob_damage(NULL, md, md->hp, 2);

+		status_kill(bl);

 	else

 		unit_remove_map(&md->bl,1);

 	

@@ -4841,7 +4848,7 @@ int atcommand_doom(
 	pl_allsd = map_getallusers(&users);

 	for(i = 0; i < users; i++) {

 		if ((pl_sd = pl_allsd[i]) && pl_sd->fd != fd && pc_isGM(sd) >= pc_isGM(pl_sd)) { // you can doom only lower or same gm level

-			pc_damage(NULL, pl_sd, pl_sd->status.hp);

+			status_kill(&pl_sd->bl);

 			clif_displaymessage(pl_sd->fd, msg_table[61]); // The holy messenger has given judgement.

 		}

 	}

@@ -4867,7 +4874,7 @@ int atcommand_doommap(
 		if ((pl_sd = pl_allsd[i]) && pl_sd->fd != fd && sd->bl.m == pl_sd->bl.m &&

 			pc_isGM(sd) >= pc_isGM(pl_sd))	// you can doom only lower or same gm level

 		{

-			pc_damage(NULL, pl_sd, pl_sd->status.hp);

+			status_kill(&pl_sd->bl);

 //			clif_specialeffect(&pl_sd->bl,450,1);

 			clif_displaymessage(pl_sd->fd, msg_table[61]); // The holy messenger has given judgement.

 		}

@@ -8247,8 +8254,6 @@ atcommand_summon(
 {

 	char name[NAME_LENGTH];

 	int mob_id = 0;

-	int x = 0;

-	int y = 0;

 	int id = 0;

 	int duration = 0;

 	struct mob_data *md;

@@ -8271,18 +8276,17 @@ atcommand_summon(
 	if(mob_id == 0 || mobdb_checkid(mob_id) == 0)

 		return -1;

 

-	x = sd->bl.x + (rand() % 10 - 5);

-	y = sd->bl.y + (rand() % 10 - 5);

+	md = mob_once_spawn_sub(&sd->bl, sd->bl.m, -1, -1, "--ja--", mob_id, "");

 

-	id = mob_once_spawn(sd,"this", x, y, "--ja--", mob_id, 1, "");

-	if((md=(struct mob_data *)map_id2bl(id))){

+	if(md){

 		md->master_id=sd->bl.id;

 		md->special_state.ai=1;

-		md->mode=md->db->mode|MD_AGGRESSIVE;

 		md->deletetimer=add_timer(tick+(duration*60000),mob_timer_delete,id,0);

 		clif_misceffect2(&md->bl,344);

+		mob_spawn(md);

+		sc_start4(&md->bl, SC_MODECHANGE, 100, 1, 0, MD_AGGRESSIVE, 0, 60000);

+		clif_skill_poseffect(&sd->bl,AM_CALLHOMUN,1,md->bl.x,md->bl.y,tick);

 	}

-	clif_skill_poseffect(&sd->bl,AM_CALLHOMUN,1,x,y,tick);

 

 	return 0;

 }

@@ -9115,7 +9119,7 @@ int atcommand_killid(
    {

       if ((pl_sd = (struct map_session_data *) session[session_id]->session_data) != NULL) {

          if (pc_isGM(sd) >= pc_isGM(pl_sd)) { // you can kill only lower or same level

-            pc_damage(NULL, pl_sd, pl_sd->status.hp);

+            status_kill(&pl_sd->bl);

             clif_displaymessage(fd, msg_table[14]); // Character killed.

          } else {

             clif_displaymessage(fd, msg_table[81]); // Your GM level don't authorise you to do this action on this player.

@@ -9163,7 +9167,7 @@ int atcommand_killid2(
    {

       if ((pl_sd = (struct map_session_data *) session[session_id]->session_data) != NULL) {

          if (pc_isGM(sd) >= pc_isGM(pl_sd)) { // you can kill only lower or same level

-            pc_damage(NULL, pl_sd, pl_sd->status.hp);

+            status_kill(&pl_sd->bl);

             clif_displaymessage(fd, msg_table[14]); // Character killed.

          } else {

             clif_displaymessage(fd, msg_table[81]); // Your GM level don't authorise you to do this action on this player.

@@ -9417,19 +9421,17 @@ int atcommand_mobinfo(
 		else

 			sprintf(atcmd_output, "Monster: '%s'/'%s' (%d)", mob->name, mob->jname, mob_id);

 		clif_displaymessage(fd, atcmd_output);

-		sprintf(atcmd_output, " Level:%d  HP:%d  SP:%d  Base EXP:%d  Job EXP:%d", mob->lv, mob->max_hp, mob->max_sp, mob->base_exp, mob->job_exp);

+		sprintf(atcmd_output, " Level:%d  HP:%d  SP:%d  Base EXP:%d  Job EXP:%d", mob->lv, mob->status.max_hp, mob->status.max_sp, mob->base_exp, mob->job_exp);

 		clif_displaymessage(fd, atcmd_output);

-		sprintf(atcmd_output, " DEF:%d  MDEF:%d  STR:%d  AGI:%d  VIT:%d  INT:%d  DEX:%d  LUK:%d", mob->def, mob->mdef, mob->str, mob->agi, mob->vit, mob->int_, mob->dex, mob->luk);

+		sprintf(atcmd_output, " DEF:%d  MDEF:%d  STR:%d  AGI:%d  VIT:%d  INT:%d  DEX:%d  LUK:%d",

+			mob->status.def, mob->status.mdef, mob->status.str, mob->status.agi,

+			mob->status.vit, mob->status.int_, mob->status.dex, mob->status.luk);

 		clif_displaymessage(fd, atcmd_output);

-		if (mob->element < 20) {

-			//Element - None, Level 0

-			i = 0;

-			j = 0;

-		} else {

-			i = mob->element % 20 + 1;

-			j = mob->element / 20;

-		}

-		sprintf(atcmd_output, " ATK:%d~%d  Range:%d~%d~%d  Size:%s  Race: %s  Element: %s (Lv:%d)", mob->atk1, mob->atk2, mob->range, mob->range2 , mob->range3, msize[mob->size], mrace[mob->race], melement[i], j);

+		

+		sprintf(atcmd_output, " ATK:%d~%d  Range:%d~%d~%d  Size:%s  Race: %s  Element: %s (Lv:%d)",

+			mob->status.rhw.atk, mob->status.rhw.atk2, mob->status.rhw.range,

+			mob->range2 , mob->range3, msize[mob->status.size],

+			mrace[mob->status.race], melement[mob->status.def_ele], mob->status.ele_lv);

 		clif_displaymessage(fd, atcmd_output);

 		// drops

 		clif_displaymessage(fd, " Drops:");

@@ -10195,7 +10197,7 @@ int atcommand_clone(
 		y = sd->bl.y;

 	}

 		

-	if((x = mob_clone_spawn(pl_sd, (char*)mapindex_id2name(sd->mapindex), x, y, "", master, 0, flag?1:0, 0)) > 0) {

+	if((x = mob_clone_spawn(pl_sd, sd->bl.m, x, y, "", master, 0, flag?1:0, 0)) > 0) {

 		clif_displaymessage(fd, msg_txt(128+flag*2));

 		return 0;

 	}