fixed Guild skill Extention +2 -> +6 people per level.

btw.. should txt-convertot use its own mmo.h? i think not

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

5 files changed, 8 insertions, 6 deletions

diff --git a/Changelog.txt b/Changelog.txt
index cc9efea9c..82f697288 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -1,5 +1,7 @@
 Date	Added
 11/28
+	* Changed Suilds Extention Skill to +6 people per level. [Lupus]
+	  (tested it for 2 weeks! or a big server)
 	* Added a fix for gettimeofday() for WIN32 [Codemaster]
 11/27
 	* Fixed a few map crashes when char-server crashes [Wizputer]
diff --git a/src/char/int_guild.c b/src/char/int_guild.c
index eb03dd335..5a6775cff 100644
--- a/src/char/int_guild.c
+++ b/src/char/int_guild.c
@@ -656,7 +656,7 @@ int guild_calcinfo(struct guild *g) {
 	g->next_exp = guild_nextexp(g->guild_lv);
 
 	// メンバ上限（ギルド拡張適用）
-	g->max_member = 16 + guild_checkskill(g, GD_EXTENSION) * 2;
+	g->max_member = 16 + guild_checkskill(g, GD_EXTENSION) * 6; //Lupus 2 -> 6
 
 	// 平均レベルとオンライン人数
 	g->average_lv = 0;
diff --git a/src/char_sql/int_guild.c b/src/char_sql/int_guild.c
index 4f6c88a70..900e2ceac 100644
--- a/src/char_sql/int_guild.c
+++ b/src/char_sql/int_guild.c
@@ -720,7 +720,7 @@ int guild_calcinfo(struct guild *g)
 	g->next_exp = guild_nextexp(g->guild_lv);
 
 	// メンバ上限（ギルド拡張適用）
-	g->max_member = 16 + guild_checkskill(g, GD_EXTENSION) * 2; // Updated max_members [PoW]
+	g->max_member = 16 + guild_checkskill(g, GD_EXTENSION) * 6; //  Guild Extention skill - adds by 6 people per level to Max Member [Lupus]
 
 	// 平均レベルとオンライン人数
 	g->average_lv=0;
diff --git a/src/common/mmo.h b/src/common/mmo.h
index 5483e30d2..ffcba6e28 100644
--- a/src/common/mmo.h
+++ b/src/common/mmo.h
@@ -39,7 +39,7 @@
 #define MAX_STORAGE 300
 #define MAX_GUILD_STORAGE 1000
 #define MAX_PARTY 12
-#define MAX_GUILD 36	// increased max guild members to accomodate for +2 increase for extension levels [Valaris] (removed) [PoW]
+#define MAX_GUILD 16+10*6	// increased max guild members to accomodate for +6 increase for extension levels [Lupus]
 #define MAX_GUILDPOSITION 20	// increased max guild positions to accomodate for all members [Valaris] (removed) [PoW]
 #define MAX_GUILDEXPLUSION 32
 #define MAX_GUILDALLIANCE 16
diff --git a/src/txt-converter/common/mmo.h b/src/txt-converter/common/mmo.h
index 178046a17..eb02b6879 100644
--- a/src/txt-converter/common/mmo.h
+++ b/src/txt-converter/common/mmo.h
@@ -29,11 +29,11 @@
 #define MAX_STORAGE 300
 #define MAX_GUILD_STORAGE 1000
 #define MAX_PARTY 12
-#define MAX_GUILD 56	// increased max guild members to accomodate for +2 increase for extension levels [Valaris]
-#define MAX_GUILDPOSITION 56	// increased max guild positions to accomodate for all members [Valaris]
+#define MAX_GUILD 16+10*6	// increased max guild members to accomodate for +6 increase for extension levels [Lupus]
+#define MAX_GUILDPOSITION 20	// increased max guild positions to accomodate for all members [Valaris]
 #define MAX_GUILDEXPLUSION 32
 #define MAX_GUILDALLIANCE 16
-#define MAX_GUILDSKILL	8
+#define MAX_GUILDSKILL	15 // increased max guild skills because of new skills [Sara-chan]
 #define MAX_GUILDCASTLE 24	// increased to include novice castles [Valaris]
 #define MAX_GUILDLEVEL 50