From 9ee5081a5ef7b8aa20cfdd992cad280665b5ed7f Mon Sep 17 00:00:00 2001
From: Vicious <Vicious@54d463be-8e91-2dee-dedb-b68131a5f0ec>
Date: Wed, 8 Mar 2006 15:43:04 +0000
Subject: some skill check condition

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@5514 54d463be-8e91-2dee-dedb-b68131a5f0ec
---
 src/map/skill.c | 82 ++++++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 79 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/map/skill.c b/src/map/skill.c
index 468850df1..dda4f1e6f 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -3078,7 +3078,8 @@ int skill_castend_damage_id (struct block_list* src, struct block_list *bl,int s
 		}
 		break;
 
-	//Until they're at right position [Vicious]
+	//Until they're at right position - gs_damage- [Vicious]
+	//Not implemented yet [Vicious]
 	case GS_GLITTERING:
 	case GS_FLING:
 	case GS_TRIPLEACTION:
@@ -5639,8 +5640,14 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in
 		}
 		break;
 
-	//Until they're at right position [Vicious]
+	//Until they're at right position - gs_nodamage- [Vicious]
+	//Not implemented yet [Vicious]
 	case GS_GLITTERING:
+	if(sd) {
+			clif_skill_nodamage(src,bl,skillid,skilllv,1);
+			pc_addspiritball(sd,skill_get_time(skillid,skilllv),skilllv);
+		}
+		break;
 	case GS_FLING:
 	case GS_TRIPLEACTION:
 	case GS_BULLSEYE:
@@ -8138,6 +8145,76 @@ int skill_check_condition(struct map_session_data *sd,int type)
 			return 0;
 		}
 		break;
+		
+	//Until they're at right position - gs_skillcheck- [Vicious]
+	case GS_GLITTERING:
+		if(sd->spiritball >= 10) {
+			clif_skill_fail(sd,skill,0,0);
+			return 0;
+		}
+		break;
+	case GS_FLING:
+	case GS_TRIPLEACTION:
+	case GS_MAGICALBULLET:
+	case GS_CRACKER:
+		if(sd->spiritball < 1) {
+			clif_skill_fail(sd,skill,0,0);
+			return 0;
+		}
+		if (skill != GS_MAGICALBULLET)
+			arrow_flag = 1;
+		break;
+	case GS_BULLSEYE:
+		if(sd->spiritball < 5) {
+			clif_skill_fail(sd,skill,0,0);
+			return 0;
+		}
+		break;
+	case GS_MADNESSCANCEL:
+		if(sd->spiritball < 4) {
+			clif_skill_fail(sd,skill,0,0);
+			return 0;
+		}
+		break;
+	case GS_ADJUSTMENT:
+	case GS_INCREASING:
+		if(sd->spiritball < 2) {
+			clif_skill_fail(sd,skill,0,0);
+			return 0;
+		}
+		break;
+	case GS_TRACKING:
+	case GS_DISARM:
+	case GS_PIERCINGSHOT:
+	case GS_RAPIDSHOWER:
+	case GS_DESPERADO:
+	case GS_DUST:
+	case GS_SPREADATTACK:
+	case GS_GROUNDDRIFT:
+	case NJ_SYURIKEN:
+	case NJ_KUNAI:
+	case NJ_HUUMA:
+		arrow_flag = 1;
+		break;
+
+	//Not implemented yet [Vicious]
+	case NJ_KASUMIKIRI:
+	case NJ_SHADOWJUMP:
+	case NJ_KIRIKAGE:
+	case NJ_UTSUSEMI:
+	case NJ_BUNSINJYUTSU:
+	case NJ_KOUENKA:
+	case NJ_KAENSIN:
+	case NJ_BAKUENRYU:
+	case NJ_HYOUSENSOU:
+	case NJ_SUITON:
+	case NJ_HYOUSYOURAKU:
+	case NJ_HUUJIN:
+	case NJ_RAIGEKISAI:
+	case NJ_KAMAITACHI:
+	case NJ_NEN:
+	case NJ_ISSEN:
+		break;
 	}
 
 	if(!(type&2)){
@@ -8253,7 +8330,6 @@ int skill_check_condition(struct map_session_data *sd,int type)
 			return 0;
 		}
 		break;
-
 	}
 
 	if (checkitem_flag) {
-- 
cgit v1.2.3-70-g09d2