Sync with L2JServer Jan 24th 2015.

trunk/dist/game/config/Character.properties

@@ -206,10 +206,6 @@ AltGameSkillLearn = False
 # Default: False
 AltSubClassWithoutQuests = False
 
-# Allow player to add/change subclass at all village master
-# Default: False
-AltSubclassEverywhere = False
-
 # Allow player to learn transformations without quest.
 # Default: False
 AltTransformationWithoutQuest = False
@@ -285,8 +281,8 @@ MaxExpBonus = 3.5
 MaxSpBonus = 3.5
 
 # Maximum character running speed.
-# Default: 250
-MaxRunSpeed = 250
+# Default: 300
+MaxRunSpeed = 300
 
 # Maximum character Physical Critical Rate. (10 = 1%)
 # Default: 500
@@ -315,6 +311,7 @@ MinAbnormalStateSuccessRate = 10
 MaxAbnormalStateSuccessRate = 90
 
 # Maximum number of allowed subclasses for every player.
+# Do not use more than 3!
 # Default: 3
 MaxSubclass = 3
 
@@ -322,6 +319,10 @@ MaxSubclass = 3
 # Default: 40
 BaseSubclassLevel = 40
 
+# Starting level for dualclasses after reawaking.
+# Default: 85
+BaseDualclassLevel = 85
+
 # Maximum subclass level.
 # Default: 80
 MaxSubclassLevel = 80
@@ -363,7 +364,7 @@ FreightPrice = 1000
 
 # Npc talk blockage. When a player talks to a NPC, he must wait some secs
 # before being able to walk again. In seconds
-# Default: 3
+# Default: 0
 # Set to 0 to disable it
 NpcTalkBlockingTime = 0
 

trunk/dist/game/config/General.properties

@@ -20,7 +20,7 @@ ServerListBrackets = False
 
 # Displays server type next to the server name on character selection.
 # Notes:
-#	Accepted Values: Normal, Relax, Test, NoLabel, Restricted, Event, Free
+#	Accepted Values: Normal, Relax, Test, Broad, Restricted, Event, Free, World, New, Classic
 # Default: Normal
 ServerListType = Normal
  
@@ -405,12 +405,8 @@ GridNeighborTurnOffTime = 90
 
 # Allow characters to receive damage from falling.
 # CoordSynchronize = 2 is recommended.
-# True - enabled.
-# False - disabled.
-# Auto - True if geodata enabled and False if disabled.
-# Default: Auto
-EnableFallingDamage = Auto
-
+# Default: True
+EnableFallingDamage = True
 
 # ---------------------------------------------------------------------------
 # Features
@@ -896,9 +892,6 @@ PacketHandlerDebug = False
 # Default: False
 Developer = False
 
-# Default: False
-AcceptGeoeditorConn = False
-
 # Don't load Handlers
 # Default: False
 AltDevNoHandlers = False

trunk/dist/game/config/GeoData.properties

@@ -2,28 +2,17 @@
 # GeoData
 # ---------------------------------------------------------------------------
 
-# GeoData options:
-# 0 = GeoData and PathFinding OFF (default)
-# 1 = GeoData is used to check Line Of Sight (LOS) targeting and 
-#     L2Playable movement. You need to download files for data/geodata folder.
-#     Monsters can pass walls but not aggro (no line of sight) through them.
-# 2 = Full GeoData enabled. Includes PathFinding (requires also /data/pathnode 
-#     files if CellPathFinding not enabled) and all character moves go through 
-#     geodata checks (if a mob passes a wall, pathfinding didn't find a route 
-#     but we allow attack and returning home).
-#     Recommended server memory minimum 2 GB, rather 3 GB.
+# Pathfinding options:
+# 0 = Disabled
+# 1 = Enabled using path node files
+# 2 = Enabled using geodata cells at runtime
 # Default: 0
-GeoData = 0
+PathFinding = 0
 
 # Pathnode directory
 # Default: data/pathnode
 PathnodeDirectory = data/pathnode
 
-# Cell-level pathfinding, produces more accurate routes but is (maybe 10x) heavier to calculate. Recommended for small servers at least.
-# If False, pathnode files are used. Uses a max number of nodes in calculation which can be adjusted in the algorithm if it needs to be faster.
-# Default: False
-CellPathFinding = False
-
 # Pathfinding array buffers configuration
 PathFindBuffers = 100x6;128x6;192x6;256x4;320x4;384x4;500x2