Prechádzať zdrojové kódy

- DaysBeforeCreateNewAllyWhenDissolved changed from 10 days to 1 day, thx devo
- GG config default false
- config for not loading scripts/quests, thx JIV

janiii 15 rokov pred
rodič
commit
4c6992147d

+ 2 - 2
L2_GameServer/java/config/Character.properties

@@ -441,8 +441,8 @@ DaysBeforeAcceptNewClanWhenDismissed = 1
 
 
 # Number of days before creating a new alliance after dissolving an old alliance.
 # Number of days before creating a new alliance after dissolving an old alliance.
 # DEFAULT NEEDS TO BE VERIFIED, MUST BE CHANGED HERE AND IN CONFIG.JAVA IF NOT CORRECT
 # DEFAULT NEEDS TO BE VERIFIED, MUST BE CHANGED HERE AND IN CONFIG.JAVA IF NOT CORRECT
-# Default: 10
-DaysBeforeCreateNewAllyWhenDissolved = 10
+# Default: 1
+DaysBeforeCreateNewAllyWhenDissolved = 1
 
 
 # Maximum number of clans in alliance.
 # Maximum number of clans in alliance.
 # Default: 3
 # Default: 3

+ 8 - 4
L2_GameServer/java/config/General.properties

@@ -83,12 +83,12 @@ GMRestartFighting = False
 BypassValidation = True
 BypassValidation = True
 
 
 # Enforce gameguard for clients. Sends a gameguard query on character login.
 # Enforce gameguard for clients. Sends a gameguard query on character login.
-# Default: True
-GameGuardEnforce = True
+# Default: False
+GameGuardEnforce = False
 
 
 # Don't allow player to perform trade, talk with npc, or move until gameguard reply is received.
 # Don't allow player to perform trade, talk with npc, or move until gameguard reply is received.
-# Default: True
-GameGuardProhibitAction = True
+# Default: False
+GameGuardProhibitAction = False
 
 
 #Logging settings. The following four settings, while enabled, will increase writing to your hard drive(s) considerably. Depending on the size of your server, the amount of players, and other factors, you may suffer a noticable performance hit.
 #Logging settings. The following four settings, while enabled, will increase writing to your hard drive(s) considerably. Depending on the size of your server, the amount of players, and other factors, you may suffer a noticable performance hit.
 # Default: False
 # Default: False
@@ -763,6 +763,10 @@ TestServer = False
 # Default: False
 # Default: False
 ListTestServers = False
 ListTestServers = False
 
 
+# Don't load quests.
+# Default: False
+AltDevNoQuests = False
+
 # Don't load spawntable.
 # Don't load spawntable.
 # Default: False
 # Default: False
 AltDevNoSpawns = False
 AltDevNoSpawns = False

+ 3 - 1
L2_GameServer/java/net/sf/l2j/Config.java

@@ -363,6 +363,7 @@ public final class Config
 	public static boolean DEVELOPER;
 	public static boolean DEVELOPER;
 	public static boolean ACCEPT_GEOEDITOR_CONN;
 	public static boolean ACCEPT_GEOEDITOR_CONN;
 	public static boolean TEST_SERVER;
 	public static boolean TEST_SERVER;
+	public static boolean ALT_DEV_NO_QUESTS;
 	public static boolean ALT_DEV_NO_SPAWNS;
 	public static boolean ALT_DEV_NO_SPAWNS;
 	public static boolean SERVER_LIST_TESTSERVER;
 	public static boolean SERVER_LIST_TESTSERVER;
 	public static int THREAD_P_EFFECTS;
 	public static int THREAD_P_EFFECTS;
@@ -1269,7 +1270,7 @@ public final class Config
 					ALT_ALLY_JOIN_DAYS_WHEN_LEAVED = Integer.parseInt(Character.getProperty("DaysBeforeJoinAllyWhenLeaved", "1"));
 					ALT_ALLY_JOIN_DAYS_WHEN_LEAVED = Integer.parseInt(Character.getProperty("DaysBeforeJoinAllyWhenLeaved", "1"));
 					ALT_ALLY_JOIN_DAYS_WHEN_DISMISSED = Integer.parseInt(Character.getProperty("DaysBeforeJoinAllyWhenDismissed", "1"));
 					ALT_ALLY_JOIN_DAYS_WHEN_DISMISSED = Integer.parseInt(Character.getProperty("DaysBeforeJoinAllyWhenDismissed", "1"));
 					ALT_ACCEPT_CLAN_DAYS_WHEN_DISMISSED = Integer.parseInt(Character.getProperty("DaysBeforeAcceptNewClanWhenDismissed", "1"));
 					ALT_ACCEPT_CLAN_DAYS_WHEN_DISMISSED = Integer.parseInt(Character.getProperty("DaysBeforeAcceptNewClanWhenDismissed", "1"));
-					ALT_CREATE_ALLY_DAYS_WHEN_DISSOLVED = Integer.parseInt(Character.getProperty("DaysBeforeCreateNewAllyWhenDissolved", "10"));
+					ALT_CREATE_ALLY_DAYS_WHEN_DISSOLVED = Integer.parseInt(Character.getProperty("DaysBeforeCreateNewAllyWhenDissolved", "1"));
 					ALT_MAX_NUM_OF_CLANS_IN_ALLY = Integer.parseInt(Character.getProperty("AltMaxNumOfClansInAlly", "3"));
 					ALT_MAX_NUM_OF_CLANS_IN_ALLY = Integer.parseInt(Character.getProperty("AltMaxNumOfClansInAlly", "3"));
 					ALT_CLAN_MEMBERS_FOR_WAR = Integer.parseInt(Character.getProperty("AltClanMembersForWar", "15"));
 					ALT_CLAN_MEMBERS_FOR_WAR = Integer.parseInt(Character.getProperty("AltClanMembersForWar", "15"));
 					ALT_MEMBERS_CAN_WITHDRAW_FROM_CLANWH= Boolean.parseBoolean(Character.getProperty("AltMembersCanWithdrawFromClanWH", "false"));
 					ALT_MEMBERS_CAN_WITHDRAW_FROM_CLANWH= Boolean.parseBoolean(Character.getProperty("AltMembersCanWithdrawFromClanWH", "false"));
@@ -1431,6 +1432,7 @@ public final class Config
 					ACCEPT_GEOEDITOR_CONN = Boolean.parseBoolean(General.getProperty("AcceptGeoeditorConn", "false"));
 					ACCEPT_GEOEDITOR_CONN = Boolean.parseBoolean(General.getProperty("AcceptGeoeditorConn", "false"));
 					TEST_SERVER = Boolean.parseBoolean(General.getProperty("TestServer", "false"));
 					TEST_SERVER = Boolean.parseBoolean(General.getProperty("TestServer", "false"));
 					SERVER_LIST_TESTSERVER = Boolean.parseBoolean(General.getProperty("ListTestServers", "false"));
 					SERVER_LIST_TESTSERVER = Boolean.parseBoolean(General.getProperty("ListTestServers", "false"));
+					ALT_DEV_NO_QUESTS = Boolean.parseBoolean(General.getProperty("AltDevNoQuests", "False"));
 					ALT_DEV_NO_SPAWNS = Boolean.parseBoolean(General.getProperty("AltDevNoSpawns", "False"));
 					ALT_DEV_NO_SPAWNS = Boolean.parseBoolean(General.getProperty("AltDevNoSpawns", "False"));
 					THREAD_P_EFFECTS = Integer.parseInt(General.getProperty("ThreadPoolSizeEffects", "10"));
 					THREAD_P_EFFECTS = Integer.parseInt(General.getProperty("ThreadPoolSizeEffects", "10"));
 					THREAD_P_GENERAL = Integer.parseInt(General.getProperty("ThreadPoolSizeGeneral", "13"));
 					THREAD_P_GENERAL = Integer.parseInt(General.getProperty("ThreadPoolSizeGeneral", "13"));

+ 2 - 1
L2_GameServer/java/net/sf/l2j/gameserver/GameServer.java

@@ -299,7 +299,8 @@ public class GameServer
 		{
 		{
 			_log.info("Loading Server Scripts");
 			_log.info("Loading Server Scripts");
 			File scripts = new File(Config.DATAPACK_ROOT + "/data/scripts.cfg");
 			File scripts = new File(Config.DATAPACK_ROOT + "/data/scripts.cfg");
-			L2ScriptEngineManager.getInstance().executeScriptList(scripts);
+			if (!Config.ALT_DEV_NO_QUESTS)
+				L2ScriptEngineManager.getInstance().executeScriptList(scripts);
 		}
 		}
 		catch (IOException ioe)
 		catch (IOException ioe)
 		{
 		{

+ 3 - 14
L2_GameServer/java/net/sf/l2j/gameserver/communitybbs/Manager/ClanBBSManager.java

@@ -46,21 +46,10 @@ public class ClanBBSManager extends BaseBBSManager
 	{
 	{
 		if (command.equals("_bbsclan"))
 		if (command.equals("_bbsclan"))
 		{
 		{
-			if (activeChar.getClan() != null)
-			{
-				if (activeChar.getClan().getLevel() >= 2)
-				{
-					clanhome(activeChar);
-				}
-				else
-				{
-					clanlist(activeChar, 1);
-				}
-			}
-			else
-			{
+			if (activeChar.getClan() == null || activeChar.getClan().getLevel() < 2)
 				clanlist(activeChar, 1);
 				clanlist(activeChar, 1);
-			}
+			else
+				clanhome(activeChar);
 		}
 		}
 		else if (command.startsWith("_bbsclan_clanlist"))
 		else if (command.startsWith("_bbsclan_clanlist"))
 		{
 		{