Răsfoiți Sursa

BETA: From now on all dances and songs will not be stored upon logout!
* '''Note:''' We keep configuration to reverse it as it was until now.
* Reported by: FinalDestination, St3eT

Rumen Nikiforov 12 ani în urmă
părinte
comite
70b1efa689

+ 4 - 0
L2J_Server_BETA/dist/game/config/Character.properties

@@ -99,6 +99,10 @@ DanceCancelBuff = False
 # Default: True
 # Default: True
 DanceConsumeAdditionalMP = True
 DanceConsumeAdditionalMP = True
 
 
+# ALlow players to have all dances/songs stored when logout.
+# Default: False
+AltStoreDances = False
+
 # This option allows a player to automatically learn Divine Inspiration.
 # This option allows a player to automatically learn Divine Inspiration.
 # This is not included in AutoLearnSkills above.
 # This is not included in AutoLearnSkills above.
 # Default: False
 # Default: False

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

@@ -127,6 +127,7 @@ public final class Config
 	public static byte DANCES_MAX_AMOUNT;
 	public static byte DANCES_MAX_AMOUNT;
 	public static boolean DANCE_CANCEL_BUFF;
 	public static boolean DANCE_CANCEL_BUFF;
 	public static boolean DANCE_CONSUME_ADDITIONAL_MP;
 	public static boolean DANCE_CONSUME_ADDITIONAL_MP;
+	public static boolean ALT_STORE_DANCES;
 	public static boolean AUTO_LEARN_DIVINE_INSPIRATION;
 	public static boolean AUTO_LEARN_DIVINE_INSPIRATION;
 	public static boolean ALT_GAME_CANCEL_BOW;
 	public static boolean ALT_GAME_CANCEL_BOW;
 	public static boolean ALT_GAME_CANCEL_CAST;
 	public static boolean ALT_GAME_CANCEL_CAST;
@@ -1541,6 +1542,7 @@ public final class Config
 			DANCES_MAX_AMOUNT = Byte.parseByte(Character.getProperty("MaxDanceAmount", "12"));
 			DANCES_MAX_AMOUNT = Byte.parseByte(Character.getProperty("MaxDanceAmount", "12"));
 			DANCE_CANCEL_BUFF = Boolean.parseBoolean(Character.getProperty("DanceCancelBuff", "false"));
 			DANCE_CANCEL_BUFF = Boolean.parseBoolean(Character.getProperty("DanceCancelBuff", "false"));
 			DANCE_CONSUME_ADDITIONAL_MP = Boolean.parseBoolean(Character.getProperty("DanceConsumeAdditionalMP", "true"));
 			DANCE_CONSUME_ADDITIONAL_MP = Boolean.parseBoolean(Character.getProperty("DanceConsumeAdditionalMP", "true"));
+			ALT_STORE_DANCES = Boolean.parseBoolean(Character.getProperty("AltStoreDances", "false"));
 			AUTO_LEARN_DIVINE_INSPIRATION = Boolean.parseBoolean(Character.getProperty("AutoLearnDivineInspiration", "false"));
 			AUTO_LEARN_DIVINE_INSPIRATION = Boolean.parseBoolean(Character.getProperty("AutoLearnDivineInspiration", "false"));
 			ALT_GAME_CANCEL_BOW = Character.getProperty("AltGameCancelByHit", "Cast").equalsIgnoreCase("bow") || Character.getProperty("AltGameCancelByHit", "Cast").equalsIgnoreCase("all");
 			ALT_GAME_CANCEL_BOW = Character.getProperty("AltGameCancelByHit", "Cast").equalsIgnoreCase("bow") || Character.getProperty("AltGameCancelByHit", "Cast").equalsIgnoreCase("all");
 			ALT_GAME_CANCEL_CAST = Character.getProperty("AltGameCancelByHit", "Cast").equalsIgnoreCase("cast") || Character.getProperty("AltGameCancelByHit", "Cast").equalsIgnoreCase("all");
 			ALT_GAME_CANCEL_CAST = Character.getProperty("AltGameCancelByHit", "Cast").equalsIgnoreCase("cast") || Character.getProperty("AltGameCancelByHit", "Cast").equalsIgnoreCase("all");

+ 6 - 0
L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2PcInstance.java

@@ -8330,6 +8330,12 @@ public final class L2PcInstance extends L2Playable
 						continue;
 						continue;
 					}
 					}
 					
 					
+					// Dances and songs are not kept in retail.
+					if (skill.isDance() && !Config.ALT_STORE_DANCES)
+					{
+						continue;
+					}
+					
 					storedSkills.add(skill.getReuseHashCode());
 					storedSkills.add(skill.getReuseHashCode());
 					
 					
 					if (effect.getInUse() && !skill.isToggle())
 					if (effect.getInUse() && !skill.isToggle())