Implemented SU_SPRITEMABLE Skill.

MaxHP + 1000, MaxSP + 100.
Show's Spirit of Sea, Land and Life around the sprite when skill is
learned.

3 files changed, 25 insertions, 1 deletions

diff --git a/db/sc_config.txt b/db/sc_config.txt
index 104f81102..8f784158a 100644
--- a/db/sc_config.txt
+++ b/db/sc_config.txt
@@ -492,5 +492,8 @@ SC_TIME_ACCESSORY, 463
 SC_MAGICAL_FEATHER, 463
 SC_BLOSSOM_FLUTTERING, 463
 
+// Summoner
+SC_SPRITEMABLE, 205
+
 // Cant Clear
 SC_ALL_RIDING, 397
diff --git a/src/map/pc.c b/src/map/pc.c
index 09f805d82..8f6d3bcb0 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -7405,6 +7405,9 @@ int pc_resetskill(struct map_session_data* sd, int flag)
 
 		if( homun_alive(sd->hd) && pc->checkskill(sd, AM_CALLHOMUN) )
 			homun->vaporize(sd, HOM_ST_REST);
+
+		if ((sd->sc.data[SC_SPRITEMABLE] && pc->checkskill(sd, SU_SPRITEMABLE)))
+			status_change_end(&sd->bl, SC_SPRITEMABLE, INVALID_TIMER);
 	}
 
 	for( i = 1; i < MAX_SKILL; i++ ) {
@@ -8627,6 +8630,9 @@ int pc_jobchange(struct map_session_data *sd,int job, int upper)
 	if(homun_alive(sd->hd) && !pc->checkskill(sd, AM_CALLHOMUN))
 		homun->vaporize(sd, HOM_ST_REST);
 
+	if ((sd->sc.data[SC_SPRITEMABLE] && pc->checkskill(sd, SU_SPRITEMABLE)))
+		status_change_end(&sd->bl, SC_SPRITEMABLE, INVALID_TIMER);
+
 	if(sd->status.manner < 0)
 		clif->changestatus(sd,SP_MANNER,sd->status.manner);
 
diff --git a/src/map/status.c b/src/map/status.c
index 8a8cf123e..bb1107ee6 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -1004,6 +1004,9 @@ void initChangeTables(void)
 	status->dbs->IconChangeTable[SC_MAGICAL_FEATHER] = SI_MAGICAL_FEATHER;
 	status->dbs->IconChangeTable[SC_BLOSSOM_FLUTTERING] = SI_BLOSSOM_FLUTTERING;
 
+	// Summoner
+	status->dbs->IconChangeTable[SC_SPRITEMABLE] = SI_SPRITEMABLE;
+
 	// Other SC which are not necessarily associated to skills.
 	status->dbs->ChangeFlagTable[SC_ATTHASTE_POTION1] |= SCB_ASPD;
 	status->dbs->ChangeFlagTable[SC_ATTHASTE_POTION2] |= SCB_ASPD;
@@ -2742,9 +2745,12 @@ int status_calc_pc_(struct map_session_data* sd, enum e_status_calc_opt opt)
 	bstatus->max_hp = (unsigned int)cap_value(i64, 0, INT_MAX);
 
 	// Absolute modifiers from passive skills
-	if((skill_lv=pc->checkskill(sd,CR_TRUST))>0)
+	if ((skill_lv=pc->checkskill(sd,CR_TRUST)) > 0)
 		bstatus->max_hp += skill_lv*200;
 
+	if ((pc->checkskill(sd,SU_SPRITEMABLE)) > 0)
+		bstatus->max_hp += 1000;
+
 	// Apply relative modifiers from equipment
 	if(sd->hprate < 0)
 		sd->hprate = 0;
@@ -2777,6 +2783,8 @@ int status_calc_pc_(struct map_session_data* sd, enum e_status_calc_opt opt)
 		bstatus->max_sp += 200 + 20 * skill_lv;
 	if( (skill_lv = pc->checkskill(sd,WM_LESSON)) > 0 )
 		bstatus->max_sp += 30 * skill_lv;
+	if ((pc->checkskill(sd,SU_SPRITEMABLE)) > 0)
+		bstatus->max_sp += 100;
 
 	// Apply relative modifiers from equipment
 	if(sd->sprate < 0)
@@ -3184,6 +3192,12 @@ int status_calc_pc_(struct map_session_data* sd, enum e_status_calc_opt opt)
 		clif->updatestatus(sd,SP_CARTINFO);
 	}
 
+	// Spirit Marble status activates automatically for a infinite
+	// amount of time when the skill is learned. Felt this was the
+	// best place to put this. [Rytech]
+	if (pc->checkskill(sd, SU_SPRITEMABLE))
+		sc_start(&sd->bl, &sd->bl, SC_SPRITEMABLE, 100, 1, INFINITE_DURATION);
+
 	calculating = 0;
 
 	return 0;
@@ -9753,6 +9767,7 @@ int status_change_start(struct block_list *src, struct block_list *bl, enum sc_t
 				if (!mob->db_checkid(val1))
 					val1 = MOBID_PORING;
 				break;
+			case SC_SPRITEMABLE:
 			case SC_ALL_RIDING:
 				tick = INFINITE_DURATION;
 				break;