Sync with L2JServer Feb 3rd 2015.

trunk/dist/game/config/Character.properties

@@ -218,6 +218,10 @@ FeeDeleteTransferSkills = 10000000
 # Default: 10000000
 FeeDeleteSubClassSkills = 10000000
 
+# Fee to remove Dual-Class skills.
+# Default: 20000000
+FeeDeleteDualClassSkills = 20000000
+
 # Need Seize your destiny quest, to awaken
 # Default: true
 NeedSeizeYourDestinyForAwaken = false
@@ -766,21 +770,6 @@ OffsetOnTeleportEnabled = True
 # Default: 50
 MaxOffsetOnTeleport = 50
 
-# Restores the player to their previous instance (ie. an instanced area/dungeon) on EnterWorld.
-# Default: False
-RestorePlayerInstance = False
-
-# Set whether summon skills can be used to summon players inside an instance.
-# When enabled individual instances can have summoning disabled in instance xml's.
-# DEFAULT NEEDS TO BE VERIFIED, MUST BE CHANGED HERE AND IN CONFIG.JAVA IF NOT CORRECT
-# Default: ?
-AllowSummonToInstance = True
-
-# When a player dies, is removed from instance after a fixed period of time.
-# Time in seconds.
-# Default: 60
-EjectDeadPlayerTime = 60
-
 # This option is to enable or disable the use of in game petitions.
 # The MaxPetitionsPerPlayer is the amount of petitions a player can make.
 # The MaximumPendingPetitions is the total amount of petitions in the server.

trunk/dist/game/config/General.properties

@@ -462,6 +462,31 @@ WearDelay = 5
 WearPrice = 10
 
 
+# ---------------------------------------------------------------------------
+# Instances
+# ---------------------------------------------------------------------------
+
+# Restores the player to their previous instance (ie. an instanced area/dungeon) on EnterWorld.
+# Default: False
+RestorePlayerInstance = False
+
+# Set whether summon skills can be used to summon players inside an instance.
+# When enabled individual instances can have summoning disabled in instance xml's.
+# DEFAULT NEEDS TO BE VERIFIED, MUST BE CHANGED HERE AND IN CONFIG.JAVA IF NOT CORRECT
+# Default: False
+AllowSummonInInstance = False
+
+# When a player dies, is removed from instance after a fixed period of time.
+# Time in seconds.
+# Default: 60
+EjectDeadPlayerTime = 60
+
+# When is instance finished, is set time to destruction currency instance.
+# Time in seconds.
+# Default: 300
+DefaultFinishTime = 300
+
+
 # ---------------------------------------------------------------------------
 # Misc Settings
 # ---------------------------------------------------------------------------
@@ -881,6 +906,10 @@ AllowReportsFromSameClanMembers = False
 # Default: False
 Debug = False
 
+# Instances debugging
+# Default: False
+InstanceDebug = False
+
 # Html action cache debugging
 # Default: False
 HtmlActionCacheDebug = False

trunk/dist/game/config/SecondaryAuth.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../data/xsd/SecondaryAuth.xsd">
-	<enabled>false</enabled> <!-- Enable Secondary Authentication on Character Select -->
+	<enabled>true</enabled> <!-- Enable Secondary Authentication on Character Select -->
 	<maxAttempts>5</maxAttempts> <!-- Max Attempts for Second Auth Password (0 to disable) -->
 	<banTime>480</banTime> <!-- Ban time if user reach maxAttempts (in minutes) -->
 	<recoveryLink>http://www.google.com</recoveryLink> <!-- Password Recovery Link -->

trunk/dist/game/config/TerritoryWar.properties

@@ -1,53 +0,0 @@
-# ---------------------------------------------------------------------------
-# TerritoryWar Settings
-# ---------------------------------------------------------------------------
-# The defaults are set to be retail-like. If you modify any of these settings your server will deviate from being retail-like.
-# Warning: 
-# Please take extreme caution when changing anything. Also please understand what you are changing before you do so on a live server.
-
-# ---------------------------------------------------------------------------
-# Standard Settings
-# ---------------------------------------------------------------------------
-
-# Length of siege before the count down (in minutes).
-# Default: 120
-WarLength = 120
-
-# Clan Minimum level to register.
-# Default: 0
-ClanMinLevel = 0
-
-# Player Minimum level to register.
-# Default: 40
-PlayerMinLevel = 40
-
-# Max number of clans and players that can register for a side.
-# Default: 500
-DefenderMaxClans = 500
-
-# Default: 500
-DefenderMaxPlayers = 500
-
-# Is Ward holding players can be attacked and killed in peace zone
-# Default: False
-PlayerWithWardCanBeKilledInPeaceZone = False
-
-# Spawn wards in Castles when Territory War is not in progress
-# Default: False
-SpawnWardsWhenTWIsNotInProgress = False
-
-# Return all wards to their own castle when Territory War starts
-# Default: False
-ReturnWardsWhenTWStarts = False
-
-# Territory Badge needed to change nobless
-# default: 100
-MinTerritoryBadgeForNobless = 100
-
-# Territory Badge needed to buy Strider
-# default: 50
-MinTerritoryBadgeForStriders = 50
-
-# Territory Badge needed to buy Guardian's Strider
-# default: 80
-MinTerritoryBadgeForBigStrider = 80