From c393837375a735ec14b4f604b60a73db4a1f04d9 Mon Sep 17 00:00:00 2001
From: skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>
Date: Wed, 15 Mar 2006 16:16:12 +0000
Subject: - gm_skill_unconditional setting now also overrides
 skill_partner_check setting.

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@5612 54d463be-8e91-2dee-dedb-b68131a5f0ec
---
 Changelog-Trunk.txt |  2 ++
 src/map/skill.c     | 16 +++++++++++-----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 36cd71758..02ea6ce18 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -5,6 +5,8 @@ IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.  EV
 GOES INTO TRUNK AND WILL BE MERGED INTO STABLE BY VALARIS AND WIZPUTER. -- VALARIS
 
 2006/03/15
+	* gm_skill_unconditional setting now also overrides skill_partner_check
+	  setting. [Skotlex]
 	* Emulated strtok_r functions to work strictly with ANSI compilers. [Lance]
 	* Added battle config options item_rate_adddrop, item_drop_add_min and
 	  item_drop_add_max to control drop rate of card-acquired loot bonuses.
diff --git a/src/map/skill.c b/src/map/skill.c
index d6804a070..137c812e9 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -3751,7 +3751,8 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in
 
 	case CG_MOONLIT:		/* 月明りの泉に落ちる花びら */
 		clif_skill_nodamage(src,bl,skillid,skilllv,1);
-		if (sd && battle_config.player_skill_partner_check) {
+		if (sd && battle_config.player_skill_partner_check &&
+			(!battle_config.gm_skilluncond || pc_isGM(sd) < battle_config.gm_skilluncond)) {
 			skill_check_pc_partner(sd, skillid, &skilllv, 1, 1);
 		} else
 			skill_moonlit(bl, NULL, skilllv); //The knockback must be invoked before starting the effect which places down the map cells. [Skotlex]
@@ -7887,7 +7888,9 @@ int skill_check_condition(struct map_session_data *sd,int type)
 		break;
 	case PR_BENEDICTIO:				/* ?ｹ??~福 */
 		{
-			if (!battle_config.player_skill_partner_check)
+			if (!battle_config.player_skill_partner_check ||
+				(battle_config.gm_skilluncond && pc_isGM(sd) >= battle_config.gm_skilluncond)
+			)
 				break; //No need to do any partner checking [Skotlex]
 			if (!(type&1))
 			{	//Started casting.
@@ -8623,8 +8626,9 @@ int skill_use_id (struct map_session_data *sd, int target_id, int skill_num, int
 	case BD_SIEGFRIED:				/* 不死?gのジ?クフリ?ド */
 	case CG_MOONLIT:				/* 月明りの?�に落ちる花びら */
 		{
-			if (battle_config.player_skill_partner_check)
-			{
+			if (battle_config.player_skill_partner_check &&
+				(!battle_config.gm_skilluncond || pc_isGM(sd) < battle_config.gm_skilluncond)
+			) {
 				if (skill_check_pc_partner(sd, skill_num, &skill_lv, 1, 0) < 1) //Note that skill_lv is automatically updated.
 				{
 					clif_skill_fail(sd,skill_num,0,0);
@@ -10018,7 +10022,9 @@ struct skill_unit_group *skill_initunitgroup(struct block_list *src,
 		sc_start4(src,SC_DANCING,100,skillid,(int)group,0,(i&UF_ENSEMBLE?BCT_SELF:0),skill_get_time(skillid,skilllv)+1000);
 		//?�奏スキルは相方をダンス?�態にする
 		if (sd && i&UF_ENSEMBLE &&
-			battle_config.player_skill_partner_check) {
+			battle_config.player_skill_partner_check &&
+			(!battle_config.gm_skilluncond || pc_isGM(sd) < battle_config.gm_skilluncond)
+			) {
 				skill_check_pc_partner(sd, skillid, &skilllv, 1, 1);
 		}
 	}
-- 
cgit v1.2.3-70-g09d2