* Removed gm_cant_party_max_lv. It now uses gm_cant_party_min_lv as the threshold. (bugreport:2051)

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

5 files changed, 8 insertions, 6 deletions

diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index a443fc34b..6f7a5f702 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -3,6 +3,8 @@ Date	Added
 AS OF SVN REV. 5091, WE ARE NOW USING TRUNK.  ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK.
 IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
 
+2008/08/15
+	* Removed gm_cant_party_max_lv. It now uses gm_cant_party_min_lv as the threshold. (bugreport:2051) [SketchyPhoenix] 
 2008/08/11
 	* Fixed right-click npc unload not unloading duplicates (bugreport:2014)
 2008/08/09
diff --git a/conf/battle/gm.conf b/conf/battle/gm.conf
index 0443875fa..b9f2a993a 100644
--- a/conf/battle/gm.conf
+++ b/conf/battle/gm.conf
@@ -102,9 +102,9 @@ gm_viewequip_min_lv: 0
 // Also, as long as this is off, players cannot invite GMs to a party as well.
 gm_can_party: no
 
-//The trust level for GMs to invite to a party. Any GMs ABOVE this level will be able to invite normal
+//The trust level for GMs to invite to a party. Any GMs ABOVE OR EQUAL TO this level will be able to invite normal
 //players into their party in addittion to other GMs. (regardless of gm_can_party)
-gm_cant_party_max_lv: 80
+gm_cant_party_max_lv: 20
 
 // Players Titles (check msg_athena.conf for title strings)
 // You may assign different titles for your Players and GMs
diff --git a/src/map/battle.c b/src/map/battle.c
index 69b4d2dd9..8753f35f4 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -3404,7 +3404,7 @@ static const struct _battle_data {
 	{ "gm_join_chat",                       &battle_config.gm_join_chat,                    0,      0,      100,            },
 	{ "gm_kick_chat",                       &battle_config.gm_kick_chat,                    0,      0,      100,            },
 	{ "gm_can_party",                       &battle_config.gm_can_party,                    0,      0,      1,              },
-	{ "gm_cant_party_max_lv",               &battle_config.gm_cant_party_max_lv,            80,     0,      100,            },
+	{ "gm_cant_party_min_lv",               &battle_config.gm_cant_party_min_lv,            20,     0,      100,            },
 	{ "player_skillfree",                   &battle_config.skillfree,                       0,      0,      1,              },
 	{ "player_skillup_limit",               &battle_config.skillup_limit,                   1,      0,      1,              },
 	{ "weapon_produce_rate",                &battle_config.wp_rate,                         100,    0,      INT_MAX,        },
diff --git a/src/map/battle.h b/src/map/battle.h
index 921d5f81d..50d780bae 100644
--- a/src/map/battle.h
+++ b/src/map/battle.h
@@ -328,7 +328,7 @@ extern struct Battle_Config
 	int disp_hpmeter;
 	int bone_drop;
 	int buyer_name;
-	int gm_cant_party_max_lv;
+	int gm_cant_party_min_lv;
 	int gm_can_party; // [SketchyPhoenix]
 
 // eAthena additions
diff --git a/src/map/party.c b/src/map/party.c
index e24acdf6a..8053aec76 100644
--- a/src/map/party.c
+++ b/src/map/party.c
@@ -292,8 +292,8 @@ int party_invite(struct map_session_data *sd,struct map_session_data *tsd)
 		return 0;
 	}
 	
-	if ( (pc_isGM(sd) && !pc_isGM(tsd) && !battle_config.gm_can_party && pc_isGM(sd) < battle_config.gm_cant_party_max_lv)
-		|| ( !pc_isGM(sd) && pc_isGM(tsd) && !battle_config.gm_can_party ) )
+	if ( (pc_isGM(sd) && !pc_isGM(tsd) && !battle_config.gm_can_party && pc_isGM(sd) < battle_config.gm_cant_party_min_lv)
+		|| ( !pc_isGM(sd) && pc_isGM(tsd) && !battle_config.gm_can_party && pc_isGM(tsd) < battle_config.gm_cant_party_min_lv) )
 	{
 		//GMs can't invite non GMs to the party if not above the invite trust level
 		//Likewise, as long as gm_can_party is off, players can't invite GMs.