Sfoglia il codice sorgente

SevenSigns Blacksmith/Merchant cannot be used during quest event period + config for bypass all checks.

JIV 15 anni fa
parent
commit
b79c4cca1e

+ 2 - 0
L2_GameServer/java/com/l2jserver/Config.java

@@ -751,6 +751,7 @@ public final class Config
 	public static double ALT_SIEGE_DUSK_GATES_PDEF_MULT;
 	public static double ALT_SIEGE_DAWN_GATES_MDEF_MULT;
 	public static double ALT_SIEGE_DUSK_GATES_MDEF_MULT;
+	public static boolean ALT_STRICT_SEVENSIGNS;
 
 
 	//--------------------------------------------------
@@ -1159,6 +1160,7 @@ public final class Config
 					ALT_SIEGE_DUSK_GATES_PDEF_MULT = Double.parseDouble(Feature.getProperty("AltDuskGatesPdefMult", "0.8"));
 					ALT_SIEGE_DAWN_GATES_MDEF_MULT = Double.parseDouble(Feature.getProperty("AltDawnGatesMdefMult", "1.1"));
 					ALT_SIEGE_DUSK_GATES_MDEF_MULT = Double.parseDouble(Feature.getProperty("AltDuskGatesMdefMult", "0.8"));
+					ALT_STRICT_SEVENSIGNS = Boolean.parseBoolean(Feature.getProperty("StrictSevenSigns", "True"));
 
 					TAKE_FORT_POINTS = Integer.parseInt(Feature.getProperty("TakeFortPoints", "200"));
 					LOOSE_FORT_POINTS = Integer.parseInt(Feature.getProperty("LooseFortPoints", "400"));

+ 44 - 32
L2_GameServer/java/com/l2jserver/gameserver/model/actor/L2Npc.java

@@ -2594,46 +2594,58 @@ public class L2Npc extends L2Character
 				filename += "blkmrkt_1.htm";
 				break;
 			case 31113: // Merchant of Mammon
-				switch (compWinner)
+				if (Config.ALT_STRICT_SEVENSIGNS)
 				{
-					case SevenSigns.CABAL_DAWN:
-						if (playerCabal != compWinner || playerCabal != sealAvariceOwner)
-						{
-							player.sendPacket(new SystemMessage(SystemMessageId.CAN_BE_USED_BY_DAWN));
-							player.sendPacket(ActionFailed.STATIC_PACKET);
-							return;
-						}
-						break;
-					case SevenSigns.CABAL_DUSK:
-						if (playerCabal != compWinner || playerCabal != sealAvariceOwner)
-						{
-							player.sendPacket(new SystemMessage(SystemMessageId.CAN_BE_USED_BY_DUSK));
-							player.sendPacket(ActionFailed.STATIC_PACKET);
+					switch (compWinner)
+					{
+						case SevenSigns.CABAL_DAWN:
+							if (playerCabal != compWinner || playerCabal != sealAvariceOwner)
+							{
+								player.sendPacket(new SystemMessage(SystemMessageId.CAN_BE_USED_BY_DAWN));
+								player.sendPacket(ActionFailed.STATIC_PACKET);
+								return;
+							}
+							break;
+						case SevenSigns.CABAL_DUSK:
+							if (playerCabal != compWinner || playerCabal != sealAvariceOwner)
+							{
+								player.sendPacket(new SystemMessage(SystemMessageId.CAN_BE_USED_BY_DUSK));
+								player.sendPacket(ActionFailed.STATIC_PACKET);
+								return;
+							}
+							break;
+						default:
+							player.sendPacket(new SystemMessage(SystemMessageId.QUEST_EVENT_PERIOD));
 							return;
-						}
-						break;
+					}
 				}
 				filename += "mammmerch_1.htm";
 				break;
 			case 31126: // Blacksmith of Mammon
-				switch (compWinner)
+				if (Config.ALT_STRICT_SEVENSIGNS)
 				{
-					case SevenSigns.CABAL_DAWN:
-						if (playerCabal != compWinner || playerCabal != sealGnosisOwner)
-						{
-							player.sendPacket(new SystemMessage(SystemMessageId.CAN_BE_USED_BY_DAWN));
-							player.sendPacket(ActionFailed.STATIC_PACKET);
-							return;
-						}
-						break;
-					case SevenSigns.CABAL_DUSK:
-						if (playerCabal != compWinner || playerCabal != sealGnosisOwner)
-						{
-							player.sendPacket(new SystemMessage(SystemMessageId.CAN_BE_USED_BY_DUSK));
-							player.sendPacket(ActionFailed.STATIC_PACKET);
+					switch (compWinner)
+					{
+						case SevenSigns.CABAL_DAWN:
+							if (playerCabal != compWinner || playerCabal != sealGnosisOwner)
+							{
+								player.sendPacket(new SystemMessage(SystemMessageId.CAN_BE_USED_BY_DAWN));
+								player.sendPacket(ActionFailed.STATIC_PACKET);
+								return;
+							}
+							break;
+						case SevenSigns.CABAL_DUSK:
+							if (playerCabal != compWinner || playerCabal != sealGnosisOwner)
+							{
+								player.sendPacket(new SystemMessage(SystemMessageId.CAN_BE_USED_BY_DUSK));
+								player.sendPacket(ActionFailed.STATIC_PACKET);
+								return;
+							}
+							break;
+						default:
+							player.sendPacket(new SystemMessage(SystemMessageId.QUEST_EVENT_PERIOD));
 							return;
-						}
-						break;
+					}
 				}
 				filename += "mammblack_1.htm";
 				break;

+ 4 - 0
L2_GameServer/java/config/Feature.properties

@@ -237,6 +237,10 @@ AltDuskGatesPdefMult = 0.8
 AltDawnGatesMdefMult = 1.1
 AltDuskGatesMdefMult = 0.8
 
+# If this = true only cabal period owners can use merchant and blacksmith of mammon. 
+# If false any player can use.
+# Default: True
+StrictSevenSigns = True
 
 # ---------------------------------------------------------------------------
 # Clan Reputation Points