Code: Select all
Index: java/config/Feature.properties===================================================================--- java/config/Feature.properties (revision 4416)+++ java/config/Feature.properties (revision 4417)@@ -9,12 +9,12 @@ # --------------------------------------------------------------------------- # Siege Time rules # Which values can change Castle Lords (day,hour,minute)-# Default: hour,minute-CLSetSiegeTimeList = hour,minute+# Default: hour+CLSetSiegeTimeList = hour # Which hours can change Castle Lords-# Default: 16,17,18,19,20,21,22-SiegeHourList = 16,17,18,19,20,21,22+# Default: 16,20+SiegeHourList = 16,20 # Teleport Function price # Price = 7 days@@ -167,12 +167,28 @@ FortressExpRegenerationFeeLvl1 = 9000 FortressExpRegenerationFeeLvl2 = 10000 -# In independence state how many and how frequently Fort owner get Blood Oath-# Default: 1, 360 min +# This is the time frequently when Fort owner gets Blood Oath, supply level raised and Fort fee is payed+# Default 360 mins+FortressPeriodicUpdateFrequency = 360++# The number of Blood Oath which given to the Fort owner clan when Fort Updater runs+# Default: 1 FortressBloodOathCount = 1-FortressBloodOathFrequency = 360 +# The maximum Fort supply level+# Max lvl what you can define here is 21!+# Default: 6+FortressMaxSupplyLevel = 6 +# Fort fee which payed to the Castle+# Default: 25000+FortressFeeForCastle = 25000++# The maximum time while a clan can own a fortress+# Deafault: 168 hours+FortressMaximumOwnTime = 168++ # --------------------------------------------------------------------------- # Seven Signs # ---------------------------------------------------------------------------Index: java/config/siege.properties===================================================================--- java/config/siege.properties (revision 4416)+++ java/config/siege.properties (revision 4417)@@ -121,17 +121,17 @@ # Rune RuneArtefact1=9132,-49151,1095,0,35469-RuneFlameTower1=16517,-47999,-640,13004,10000-RuneFlameTower2=16517,-50292,-40,13004,10000-RuneControlTower1=18257,-49135,-570,13002,10000-RuneControlTower2=13468,-52396,908,13002,10000-RuneControlTower3=8352,-49058,1252,13002,10000+RuneFlameTower1=12864,-47440,-1087,13004,10000+RuneFlameTower2=12225,-50767,1248,13004,10000+RuneControlTower1=16565,-50318,-641,13002,10000+RuneControlTower2=16559,-48000,-641,13002,10000+RuneControlTower3=10775,-48481,83,13002,10000 # Schuttgart SchuttgartArtefact1=76674,-154521,228,32768,35515 SchuttgartArtefact2=78440,-154521,228,0,35514-SchuttgartFlameTower1=79206,-152517,115,13004,10000-SchuttgartFlameTower2=75905,-152502,115,13004,10000-SchuttgartControlTower1=80334,-152896,5,13002,10000-SchuttgartControlTower2=74764,-152896,5,13002,10000-SchuttgartControlTower3=77547,-153246,100,13002,10000\ No newline at end of file+SchuttgartFlameTower1=78233,-151037,120,13004,10000+SchuttgartFlameTower2=76872,-151043,120,13004,10000+SchuttgartControlTower1=80334,-152898,-8,13002,10000+SchuttgartControlTower2=74775,-152928,-8,13002,10000+SchuttgartControlTower3=77547,-153246,112,13002,10000\ No newline at end of fileIndex: java/config/Character.properties===================================================================--- java/config/Character.properties (revision 4416)+++ java/config/Character.properties (revision 4417)@@ -285,6 +285,7 @@ MaximumSlotsForNoDwarf = 80 MaximumSlotsForDwarf = 100 MaximumSlotsForGMPlayer = 250+MaximumSlotsForQuestItems = 100 # This will control a character's warehouse capacity. # Notes:@@ -654,17 +655,16 @@ # In that case he will not receive any Exp/SP from party and is not counted for party bonus. # If you don't want to have a cutoff point for party members' XP distribution, set the first option to "none". # Available Options: auto, level, percentage, none-# DEFAULT NEEDS TO BE VERIFIED, MUST BE CHANGED HERE AND IN CONFIG.JAVA IF NOT CORRECT-# Default: auto-PartyXpCutoffMethod = auto+# Default: level+PartyXpCutoffMethod = level # This option takes effect when "percentage" method is chosen. Don't use high values for this! # Default: 3.0 PartyXpCutoffPercent = 3.0 # This option takes effect when "level" method is chosen. Don't use low values for this!-# Default: 30-PartyXpCutoffLevel = 30+# Default: 20+PartyXpCutoffLevel = 20 # Disable tutorial on new player enter into Game # Please remember its sometimes important to novice players@@ -679,4 +679,9 @@ # Player can in client define his own key mapping and for save it must be stored server side. # Disabled until confirmed as working. # Default: False-StoreCharUiSettings = False\ No newline at end of file+StoreCharUiSettings = False++# Character name restriction+# Disallow characters to have a name which contains the words.+# Split them with ",". Example: announcements,announce...+ForbiddenNames = annou,ammou,amnou,anmou,anou,amouIndex: java/config/loginserver.properties===================================================================--- java/config/loginserver.properties (revision 4416)+++ java/config/loginserver.properties (revision 4417)@@ -10,28 +10,7 @@ # --------------------------------------------------------------------------- # Networking # ----------------------------------------------------------------------------# This is transmitted to the clients connecting from an external network, so it has to be a public IP or resolvable hostname-# Common settings...-# 127.0.0.1 - If you are playing alone on a test server-# 192.168.x.x - This is if you are on a 192.168.x.x type network (behind a standard consumer router) and want other computers from JUST the internal network to be able to connect-# x.x.x.x - WAN IP obtained from http://www.whatismyip.com/. This is if you want people outside your internal network to be able to connect to your server.-# ----------------------------------------------------------------------------# Default: 127.0.0.1-ExternalHostname = 127.0.0.1 -# ----------------------------------------------------------------------------# This is transmitted to the client from the same network, so it has to be a local IP or resolvable hostname.-# This can be the internal IP such as 127.0.0.1 or the computer's IP such as 192.168.x.x.-# ----------------------------------------------------------------------------# Default: 127.0.0.1-InternalHostname = 127.0.0.1--# ----------------------------------------------------------------------------# If you are behind a router which using its own local IP for Port Forwarding then set this to the routers-# local IP if you want people outside your internal network to be able to connect to your server.-# ----------------------------------------------------------------------------# RouterHostname = - # Bind ip of the LoginServer, use * to bind on all available IPs # Default: * LoginserverHostname = *Index: java/config/ipconfig.xml===================================================================--- java/config/ipconfig.xml (revision 0)+++ java/config/ipconfig.xml (revision 4417)@@ -0,0 +1,10 @@+<?xml version="1.0" encoding="UTF-8"?>+<!-- Put old contents of ExternalHostname here, used by default -->+<gameserver address="127.0.0.1">+ <!-- Localhost access -->+ <define subnet="127.0.0.0/8" address="127.0.0.1" />+ <!-- LAN's, put old contents of InternalHostname here -->+ <define subnet="10.0.0.0/8" address="10.0.0.0" />+ <define subnet="172.16.0.0/19" address="172.16.0.0" />+ <define subnet="192.168.0.0/16" address="192.168.0.0" />+</gameserver>\ No newline at end of fileIndex: java/config/floodprotector.properties===================================================================--- java/config/floodprotector.properties (revision 4416)+++ java/config/floodprotector.properties (revision 4417)@@ -112,3 +112,10 @@ FloodProtectorCharacterSelectPunishmentLimit = 0 FloodProtectorCharacterSelectPunishmentType = none FloodProtectorCharacterSelectPunishmentTime = 0++# Item Auction - Request for refresh+FloodProtectorItemAuctionInterval = 9+FloodProtectorItemAuctionLogFlooding = False+FloodProtectorItemAuctionPunishmentLimit = 0+FloodProtectorItemAuctionPunishmentType = none+FloodProtectorItemAuctionPunishmentTime = 0Index: java/config/server.properties===================================================================--- java/config/server.properties (revision 4416)+++ java/config/server.properties (revision 4417)@@ -10,24 +10,10 @@ # --------------------------------------------------------------------------- # Networking # ----------------------------------------------------------------------------# This is transmitted to the clients connecting from an external network, so it has to be a public IP or resolvable hostname-# Common settings...-# 127.0.0.1 - If you are playing alone on a test server-# 192.168.x.x - This is if you are on a 192.168.x.x type network (behind a standard consumer router) and want other computers from JUST the internal network to be able to connect-# x.x.x.x - WAN IP obtained from http://www.whatismyip.com/. This is if you want people outside your internal network to be able to connect to your server.-# If this IP is resolvable by the Login Server, just leave *.-# ----------------------------------------------------------------------------# Default: *-ExternalHostname = *+#+# Note: External/Internal address definitions was moved to the ipconfig.xml+# -# ----------------------------------------------------------------------------# This is transmitted to the client from the same network, so it has to be a local IP or resolvable hostname.-# This can be the internal IP such as 127.0.0.1 or the computer's IP such as 192.168.x.x.-# If this IP is resolvable by the Login Server, just leave *.-# ----------------------------------------------------------------------------# Default: *-InternalHostname = *- # Where's the Login server this gameserver should connect to # Default: 127.0.0.1 LoginHost = 127.0.0.1@@ -36,7 +22,8 @@ # Default: 9014 LoginPort = 9014 -# Default: *+# Bind address for gameserver. You should not need to change it in most cases.+# Default: * (0.0.0.0) GameserverHostname = * # Default: 7777@@ -91,8 +78,8 @@ # Numbers of protocol revisions that server allows to connect. # Delimiter is ; # WARNING: <u><b><font color="red">Changing the protocol revision may result in incompatible communication and many errors in game!</font></b></u>-# Default: 146;152-AllowedProtocolRevisions = 152+# Default: 216+AllowedProtocolRevisions = 216 # ---------------------------------------------------------------------------Index: java/config/l2jmods.properties===================================================================--- java/config/l2jmods.properties (revision 4416)+++ java/config/l2jmods.properties (revision 4417)@@ -379,3 +379,14 @@ # Basic protection against L2Walker. # Default: False L2WalkerProtection = False+++# ---------------------------------------------------------------------------+# Debug enable/disable voice command+# ---------------------------------------------------------------------------+# This option will enable voice command .debug allowing players+# to turn on/off debugging on self only.+# (admin command //debug can enable debugging on any character)+# Use admin_command_access_rights table for defining access rights.+# Default: False+DebugVoiceCommand = FalseIndex: java/config/General.properties===================================================================--- java/config/General.properties (revision 4416)+++ java/config/General.properties (revision 4417)@@ -20,10 +20,19 @@ # Default: False ServerListBrackets = False -# Displays a clock next to the server name on character selection.-# Default: False-ServerListClock = False+# Displays server type next to the server name on character selection.+# Notes:+# Accepted Values: Normal, Relax, Test, NoLabel, Restricted, Event, Free+# Default: Normal+ServerListType = Normal+ +# Displays server min age to the server name on character selection.+# Notes:+# Accepted values: 0, 15, 18+# Default: 0+ServerListAge = 0 + # If True, only accounts with GM access can enter the server. # Default: False ServerGMOnly = False@@ -106,6 +115,9 @@ # Default: False LogItems = False +# Log only Adena and equipable items if LogItems is enabled+LogItemsSmallLog = False+ # Default: False LogItemEnchants = False @@ -122,6 +134,20 @@ # Default: 5000 LogGameDamageThreshold = 5000 +# Check players for non-allowed skills+# Default: False+SkillCheckEnable = False++# If true, remove invalid skills from player and database.+# Report only, if false.+# Default: False+SkillCheckRemove = False++# Check also GM characters (only if SkillCheckEnable = True)+# Default: True+SkillCheckGM = True++ # --------------------------------------------------------------------------- # Thread Configuration # ---------------------------------------------------------------------------@@ -159,6 +185,60 @@ # ---------------------------------------------------------------------------+# Client packet queue tuning+# ---------------------------------------------------------------------------+# Queue size, do not set it too low !+# 0 - use value MaxReadPerPass + 2 (from mmo.properties)+# Default: 0+ClientPacketQueueSize = 0++# Maximum number of packets in burst.+# Execution will be aborted and thread released if more packets executed in raw.+# 0 - use value MaxReadPerPass + 1 (from mmo.properties)+# Default: 0+ClientPacketQueueMaxBurstSize = 0++# Maximum number of packets per second.+# Flood detector will be triggered if more packets received.+# After triggering all incoming packets will be dropped until flooding stopped.+# Default: 80+ClientPacketQueueMaxPacketsPerSecond = 80++# Average number of packets per second calculated during this interval.+# Using larger value decrease number of false kicks, but slower reaction to flood.+# Avoid using too low or too high values, recommended between 3 and 10.+# Default: 5+ClientPacketQueueMeasureInterval = 5++# Maximum average number of packets per second during measure interval.+# Flood detector will be triggered if more packets received.+# After triggering all incoming packets will be dropped until flooding stopped.+# Default: 40+ClientPacketQueueMaxAveragePacketsPerSecond = 40++# Maximum number of flood triggers per minute.+# Client will be kicked if more floods detected.+# Default: 2+ClientPacketQueueMaxFloodsPerMin = 2++# Maximum number of queue overflows per minute.+# After overflow all incoming packets from client are dropped until queue is flushed.+# Client will be kicked if more queue overflows detected.+# Default: 1+ClientPacketQueueMaxOverflowsPerMin = 1++# Maximum number of buffer underflows per minute.+# Client will be kicked if more underflow exceptions detected.+# Default: 1+ClientPacketQueueMaxUnderflowsPerMin = 1++# Maximum number of unknown packets per minute.+# Client will be kicked if more unknown packets received.+# Default: 5+ClientPacketQueueMaxUnknownPerMin = 5+++# --------------------------------------------------------------------------- # Optimization # --------------------------------------------------------------------------- # Items on ground management.@@ -585,6 +665,23 @@ # ---------------------------------------------------------------------------+# Item Auction+# ---------------------------------------------------------------------------+#+AltItemAuctionEnabled = False++# Number of days before auction cleared from database with all bids.+# Default: 14+AltItemAuctionExpiredAfter = 14++# Auction extends to specified amount of seconds if one or more new bids added.+# By default auction extends only two times, by 5 and 3 minutes, this custom value used after it.+# Values higher than 60s is not recommended.+# Default: 0+AltItemAuctionTimeExtendsOnBid = 0+++# --------------------------------------------------------------------------- # Dimension Rift # --------------------------------------------------------------------------- # Minimal party size to enter rift. Min = 2, Max = 9.@@ -744,10 +841,6 @@ # Default: False TestServer = False -# If this is True then test servers will be listed like test servers.-# Default: False-ListTestServers = False- # Don't load Handlers # Default: False AltDevNoHandlers = FalseIndex: java/config/olympiad.properties===================================================================--- java/config/olympiad.properties (revision 4416)+++ java/config/olympiad.properties (revision 4417)@@ -100,6 +100,7 @@ AltOlyAnnounceGames = True # Restrict specified items in Olympiad. ItemID's need to be separated with a comma (ex. 1,200,350)+# Equipped items will be moved to inventory during port. # Default: 0 AltOlyRestrictedItems = 0 Index: java/config/rates.properties===================================================================--- java/config/rates.properties (revision 4416)+++ java/config/rates.properties (revision 4417)@@ -40,7 +40,7 @@ # Use additional item multipliers? # Default: False-UseQuestRewardMultipliers = True+UseQuestRewardMultipliers = False # Default reward multiplier # When UseRewardMultipliers=False - default multiplier is used for any reward@@ -144,27 +144,23 @@ # Herbs # --------------------------------------------------------------------------- # Herb of Power, Herb of Magic, Herb of Attack Speed, Herb of Casting Speed, Herb of Critical Attack, Herb of Speed-# Default: 15-RateCommonHerbs = 15+# Default: 1+RateCommonHerbs = 1 -# Herb of Life, Herb of Mana-# Default: 10-RateHpMpHerbs = 10+# Herb of Life, Greater herb of Life, Superior Herb of Life+# Default: 1+RateHpHerbs = 1 -# Greater herb of Life, Greater Herb of Mana-# Default: 4-RateGreaterHerbs = 4+# Herb of Mana, Greater herb of Mana, Superior Herb of Mana+# Default: 1+RateMpHerbs = 1 -# Superior Herb of Life, Superior Herb of Mana-# Default: 0.8-RateSuperiorHerbs = 0.8- # Herb of Warrior, Herb of Mystic, Herb of Recovery-# Default: 0.2-RateSpecialHerbs = 0.2+# Default: 1+RateSpecialHerbs = 1 # Rate to configure the chance in percent vitality resplenishing herbs are dropping. # Note you'll need to enable EnableVitalityHerbs # Notes: # Works only if EnableVitality = True-RateVitalityHerbs = 2.+RateVitalityHerbs = 1Index: java/config/NPC.properties===================================================================--- java/config/NPC.properties (revision 4416)+++ java/config/NPC.properties (revision 4417)@@ -69,6 +69,15 @@ # Default: 78 MinNPCLevelForDmgPenalty = 78 +# The penalty in percent for -2 till -5 level differences+# default: +# normal - 0.7, 0.6, 0.6, 0.55+# critical - 0.75, 0.65, 0.6, 0.58+# skill - 0.8, 0.7, 0.65, 0.62+DmgPenaltyForLvLDifferences = 0.7, 0.6, 0.6, 0.55+CritDmgPenaltyForLvLDifferences = 0.75, 0.65, 0.6, 0.58+SkillDmgPenaltyForLvLDifferences = 0.8, 0.7, 0.65, 0.62+ # The minimum NPC level for the Gracia Epilogue rule: # "When a character's level is 3 or more levels lower than that of a monsters level the chance that the monster will be able to resist a magic spell will increase." # Notes:@@ -76,7 +85,11 @@ # Default: 78 MinNPCLevelForMagicPenalty = 78 +# The penalty in percent for -3 till -6 level differences+# Default: unknown+SkillChancePenaltyForLvLDifferences = 2.5, 3.0, 3.25, 3.5 + # --------------------------------------------------------------------------- # Guards # ---------------------------------------------------------------------------