From 44102eacfc66384351fde49955fd2a92e5ca8d4d Mon Sep 17 00:00:00 2001 From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com> Date: Thu, 10 Mar 2016 21:20:09 +0000 Subject: [PATCH] Renamed some XML files. --- .../{accessLevels.xml => AccessLevels.xml} | 2 +- .../{adminCommands.xml => AdminCommands.xml} | 2 +- ...nishments.xml => BotReportPunishments.xml} | 2 +- trunk/dist/game/config/Character.ini | 2 +- trunk/dist/game/config/Custom.ini | 4 +- .../{categoryData.xml => CategoryData.xml} | 2 +- .../{cursedWeapons.xml => CursedWeapons.xml} | 2 +- trunk/dist/game/data/{doors.xml => Doors.xml} | 2 +- ...nchantItemData.xml => EnchantItemData.xml} | 2 +- ...ntItemGroups.xml => EnchantItemGroups.xml} | 2 +- ...ItemOptions.xml => EnchantItemOptions.xml} | 2 +- ...SkillGroups.xml => EnchantSkillGroups.xml} | 2 +- .../{instancenames.xml => InstanceNames.xml} | 2 +- ...CrystalData.xml => LevelUpCrystalData.xml} | 2 +- .../data/{minionData.xml => MinionData.xml} | 2 +- .../game/data/{recipes.xml => Recipes.xml} | 2 +- trunk/dist/game/data/{seeds.xml => Seeds.xml} | 2 +- .../data/{shuttledata.xml => ShuttleData.xml} | 2 +- .../data/{skillLearn.xml => SkillLearn.xml} | 2 +- ...stalOptions.xml => SoulCrystalOptions.xml} | 2 +- .../{staticObjects.xml => StaticObjects.xml} | 2 +- .../game/data/html/admin/instancezone2.htm | 2 +- .../instances/{coliseum.xml => Coliseum.xml} | 0 .../{fortdungeon.xml => FortDungeon.xml} | 0 trunk/dist/game/data/instances/demo.xml | 17 ------- .../Q00350_EnhanceYourWeapon.java | 6 +-- .../Q00511_AwlUnderFoot.java | 2 +- trunk/dist/game/data/startPoints.xml | 28 ------------ .../{accessLevels.xsd => AccessLevels.xsd} | 0 .../{adminCommands.xsd => AdminCommands.xsd} | 0 ...nishments.xsd => BotReportPunishments.xsd} | 0 .../{categoryData.xsd => CategoryData.xsd} | 0 .../{cursedWeapons.xsd => CursedWeapons.xsd} | 0 .../game/data/xsd/{doors.xsd => Doors.xsd} | 0 ...nchantItemData.xsd => EnchantItemData.xsd} | 0 ...ntItemGroups.xsd => EnchantItemGroups.xsd} | 0 ...ItemOptions.xsd => EnchantItemOptions.xsd} | 0 ...SkillGroups.xsd => EnchantSkillGroups.xsd} | 0 .../{instancenames.xsd => InstanceNames.xsd} | 0 ...CrystalData.xsd => LevelUpCrystalData.xsd} | 0 .../xsd/{minionData.xsd => MinionData.xsd} | 0 .../data/xsd/{recipes.xsd => Recipes.xsd} | 0 .../game/data/xsd/{seeds.xsd => Seeds.xsd} | 0 .../xsd/{shuttledata.xsd => Shuttledata.xsd} | 0 .../xsd/{skillLearn.xsd => SkillLearn.xsd} | 0 ...stalOptions.xsd => SoulCrystalOptions.xsd} | 0 .../{staticObjects.xsd => StaticObjects.xsd} | 0 trunk/dist/game/data/xsd/tar_beetle.xsd | 44 ------------------- trunk/java/com/l2jmobius/Config.java | 2 +- .../gameserver/data/xml/impl/AdminData.java | 4 +- .../data/xml/impl/CategoryData.java | 2 +- .../data/xml/impl/DailyMissionData.java | 2 +- .../gameserver/data/xml/impl/DoorData.java | 2 +- .../data/xml/impl/EnchantItemData.java | 2 +- .../data/xml/impl/EnchantItemGroupsData.java | 2 +- .../data/xml/impl/EnchantItemOptionsData.java | 2 +- .../data/xml/impl/EnchantSkillGroupsData.java | 2 +- .../gameserver/data/xml/impl/NpcData.java | 2 +- .../gameserver/data/xml/impl/RecipeData.java | 2 +- .../gameserver/data/xml/impl/ShuttleData.java | 2 +- .../data/xml/impl/SkillLearnData.java | 2 +- .../data/xml/impl/SoulCrystalOptionsData.java | 2 +- .../data/xml/impl/StaticObjectData.java | 2 +- .../gameserver/datatables/BotReportTable.java | 6 +-- .../instancemanager/CastleManorManager.java | 2 +- .../instancemanager/CursedWeaponsManager.java | 2 +- .../instancemanager/InstanceManager.java | 2 +- .../gameserver/model/entity/Instance.java | 2 +- 68 files changed, 50 insertions(+), 139 deletions(-) rename trunk/dist/game/config/{accessLevels.xml => AccessLevels.xml} (97%) rename trunk/dist/game/config/{adminCommands.xml => AdminCommands.xml} (97%) rename trunk/dist/game/config/{botreport_punishments.xml => BotReportPunishments.xml} (91%) rename trunk/dist/game/data/{categoryData.xml => CategoryData.xml} (97%) rename trunk/dist/game/data/{cursedWeapons.xml => CursedWeapons.xml} (91%) rename trunk/dist/game/data/{doors.xml => Doors.xml} (99%) rename trunk/dist/game/data/{enchantItemData.xml => EnchantItemData.xml} (97%) rename trunk/dist/game/data/{enchantItemGroups.xml => EnchantItemGroups.xml} (96%) rename trunk/dist/game/data/{enchantItemOptions.xml => EnchantItemOptions.xml} (98%) rename trunk/dist/game/data/{enchantSkillGroups.xml => EnchantSkillGroups.xml} (99%) rename trunk/dist/game/data/{instancenames.xml => InstanceNames.xml} (97%) rename trunk/dist/game/data/{levelUpCrystalData.xml => LevelUpCrystalData.xml} (97%) rename trunk/dist/game/data/{minionData.xml => MinionData.xml} (97%) rename trunk/dist/game/data/{recipes.xml => Recipes.xml} (97%) rename trunk/dist/game/data/{seeds.xml => Seeds.xml} (99%) rename trunk/dist/game/data/{shuttledata.xml => ShuttleData.xml} (94%) rename trunk/dist/game/data/{skillLearn.xml => SkillLearn.xml} (97%) rename trunk/dist/game/data/{soulCrystalOptions.xml => SoulCrystalOptions.xml} (99%) rename trunk/dist/game/data/{staticObjects.xml => StaticObjects.xml} (98%) rename trunk/dist/game/data/instances/{coliseum.xml => Coliseum.xml} (100%) rename trunk/dist/game/data/instances/{fortdungeon.xml => FortDungeon.xml} (100%) delete mode 100644 trunk/dist/game/data/instances/demo.xml delete mode 100644 trunk/dist/game/data/startPoints.xml rename trunk/dist/game/data/xsd/{accessLevels.xsd => AccessLevels.xsd} (100%) rename trunk/dist/game/data/xsd/{adminCommands.xsd => AdminCommands.xsd} (100%) rename trunk/dist/game/data/xsd/{botreport_punishments.xsd => BotReportPunishments.xsd} (100%) rename trunk/dist/game/data/xsd/{categoryData.xsd => CategoryData.xsd} (100%) rename trunk/dist/game/data/xsd/{cursedWeapons.xsd => CursedWeapons.xsd} (100%) rename trunk/dist/game/data/xsd/{doors.xsd => Doors.xsd} (100%) rename trunk/dist/game/data/xsd/{enchantItemData.xsd => EnchantItemData.xsd} (100%) rename trunk/dist/game/data/xsd/{enchantItemGroups.xsd => EnchantItemGroups.xsd} (100%) rename trunk/dist/game/data/xsd/{enchantItemOptions.xsd => EnchantItemOptions.xsd} (100%) rename trunk/dist/game/data/xsd/{enchantSkillGroups.xsd => EnchantSkillGroups.xsd} (100%) rename trunk/dist/game/data/xsd/{instancenames.xsd => InstanceNames.xsd} (100%) rename trunk/dist/game/data/xsd/{levelUpCrystalData.xsd => LevelUpCrystalData.xsd} (100%) rename trunk/dist/game/data/xsd/{minionData.xsd => MinionData.xsd} (100%) rename trunk/dist/game/data/xsd/{recipes.xsd => Recipes.xsd} (100%) rename trunk/dist/game/data/xsd/{seeds.xsd => Seeds.xsd} (100%) rename trunk/dist/game/data/xsd/{shuttledata.xsd => Shuttledata.xsd} (100%) rename trunk/dist/game/data/xsd/{skillLearn.xsd => SkillLearn.xsd} (100%) rename trunk/dist/game/data/xsd/{soulCrystalOptions.xsd => SoulCrystalOptions.xsd} (100%) rename trunk/dist/game/data/xsd/{staticObjects.xsd => StaticObjects.xsd} (100%) delete mode 100644 trunk/dist/game/data/xsd/tar_beetle.xsd diff --git a/trunk/dist/game/config/accessLevels.xml b/trunk/dist/game/config/AccessLevels.xml similarity index 97% rename from trunk/dist/game/config/accessLevels.xml rename to trunk/dist/game/config/AccessLevels.xml index 26d66ef5df..ea410c1e6a 100644 --- a/trunk/dist/game/config/accessLevels.xml +++ b/trunk/dist/game/config/AccessLevels.xml @@ -1,5 +1,5 @@ - + diff --git a/trunk/dist/game/config/adminCommands.xml b/trunk/dist/game/config/AdminCommands.xml similarity index 97% rename from trunk/dist/game/config/adminCommands.xml rename to trunk/dist/game/config/AdminCommands.xml index 2e46088b11..c9e9d858dd 100644 --- a/trunk/dist/game/config/adminCommands.xml +++ b/trunk/dist/game/config/AdminCommands.xml @@ -1,5 +1,5 @@ - + diff --git a/trunk/dist/game/config/botreport_punishments.xml b/trunk/dist/game/config/BotReportPunishments.xml similarity index 91% rename from trunk/dist/game/config/botreport_punishments.xml rename to trunk/dist/game/config/BotReportPunishments.xml index c42ecc5724..5875f4de51 100644 --- a/trunk/dist/game/config/botreport_punishments.xml +++ b/trunk/dist/game/config/BotReportPunishments.xml @@ -1,5 +1,5 @@ - + diff --git a/trunk/dist/game/config/Character.ini b/trunk/dist/game/config/Character.ini index 5bb30d8019..0811d923bd 100644 --- a/trunk/dist/game/config/Character.ini +++ b/trunk/dist/game/config/Character.ini @@ -420,7 +420,7 @@ ChangeChanceElement = 60 EnchantBlackList = 7816,7817,7818,7819,7820,7821,7822,7823,7824,7825,7826,7827,7828,7829,7830,7831,13293,13294,13296 # If enabled, enchanting over the maximum enchant limit will not be possible; instead, a warning message will be sent to the player. -# You can set custom maxEnchant values at enchantItemData.xml +# You can set custom maxEnchant values at EnchantItemData.xml # Default: True DisableOverEnchanting = True diff --git a/trunk/dist/game/config/Custom.ini b/trunk/dist/game/config/Custom.ini index 811656531b..5b96bcc5a7 100644 --- a/trunk/dist/game/config/Custom.ini +++ b/trunk/dist/game/config/Custom.ini @@ -152,8 +152,8 @@ TvTEventEnabled = False TvTEventInInstance = False # Name of the instance file for TvT -# Default: coliseum.xml -TvTEventInstanceFile = coliseum.xml +# Default: Coliseum.xml +TvTEventInstanceFile = Coliseum.xml # Times TvT will occur (24h format). # Default: 9:00,15:00,21:00,3:00 diff --git a/trunk/dist/game/data/categoryData.xml b/trunk/dist/game/data/CategoryData.xml similarity index 97% rename from trunk/dist/game/data/categoryData.xml rename to trunk/dist/game/data/CategoryData.xml index 7db14172c2..57160abe12 100644 --- a/trunk/dist/game/data/categoryData.xml +++ b/trunk/dist/game/data/CategoryData.xml @@ -1,5 +1,5 @@ - + 0 1 diff --git a/trunk/dist/game/data/cursedWeapons.xml b/trunk/dist/game/data/CursedWeapons.xml similarity index 91% rename from trunk/dist/game/data/cursedWeapons.xml rename to trunk/dist/game/data/CursedWeapons.xml index 0751e2435b..ae94bc2903 100644 --- a/trunk/dist/game/data/cursedWeapons.xml +++ b/trunk/dist/game/data/CursedWeapons.xml @@ -1,5 +1,5 @@ - + diff --git a/trunk/dist/game/data/doors.xml b/trunk/dist/game/data/Doors.xml similarity index 99% rename from trunk/dist/game/data/doors.xml rename to trunk/dist/game/data/Doors.xml index c3cb1e86cf..3d3dc28487 100644 --- a/trunk/dist/game/data/doors.xml +++ b/trunk/dist/game/data/Doors.xml @@ -1,5 +1,5 @@ - + diff --git a/trunk/dist/game/data/enchantItemData.xml b/trunk/dist/game/data/EnchantItemData.xml similarity index 97% rename from trunk/dist/game/data/enchantItemData.xml rename to trunk/dist/game/data/EnchantItemData.xml index 12711e3f69..b8f7300a74 100644 --- a/trunk/dist/game/data/enchantItemData.xml +++ b/trunk/dist/game/data/EnchantItemData.xml @@ -1,5 +1,5 @@ - + diff --git a/trunk/dist/game/data/enchantItemGroups.xml b/trunk/dist/game/data/EnchantItemGroups.xml similarity index 96% rename from trunk/dist/game/data/enchantItemGroups.xml rename to trunk/dist/game/data/EnchantItemGroups.xml index 174eaf5c74..bffa5cd4a1 100644 --- a/trunk/dist/game/data/enchantItemGroups.xml +++ b/trunk/dist/game/data/EnchantItemGroups.xml @@ -1,5 +1,5 @@ - + diff --git a/trunk/dist/game/data/enchantItemOptions.xml b/trunk/dist/game/data/EnchantItemOptions.xml similarity index 98% rename from trunk/dist/game/data/enchantItemOptions.xml rename to trunk/dist/game/data/EnchantItemOptions.xml index 5b01652f96..09340a1e88 100644 --- a/trunk/dist/game/data/enchantItemOptions.xml +++ b/trunk/dist/game/data/EnchantItemOptions.xml @@ -1,5 +1,5 @@ - + diff --git a/trunk/dist/game/data/enchantSkillGroups.xml b/trunk/dist/game/data/EnchantSkillGroups.xml similarity index 99% rename from trunk/dist/game/data/enchantSkillGroups.xml rename to trunk/dist/game/data/EnchantSkillGroups.xml index 41e723f002..636ac0ecb3 100644 --- a/trunk/dist/game/data/enchantSkillGroups.xml +++ b/trunk/dist/game/data/EnchantSkillGroups.xml @@ -1,5 +1,5 @@ - + diff --git a/trunk/dist/game/data/instancenames.xml b/trunk/dist/game/data/InstanceNames.xml similarity index 97% rename from trunk/dist/game/data/instancenames.xml rename to trunk/dist/game/data/InstanceNames.xml index e38b642a84..3ec54eadfd 100644 --- a/trunk/dist/game/data/instancenames.xml +++ b/trunk/dist/game/data/InstanceNames.xml @@ -1,5 +1,5 @@ - + diff --git a/trunk/dist/game/data/levelUpCrystalData.xml b/trunk/dist/game/data/LevelUpCrystalData.xml similarity index 97% rename from trunk/dist/game/data/levelUpCrystalData.xml rename to trunk/dist/game/data/LevelUpCrystalData.xml index 2b177be39f..f5fdd0f0d4 100644 --- a/trunk/dist/game/data/levelUpCrystalData.xml +++ b/trunk/dist/game/data/LevelUpCrystalData.xml @@ -1,5 +1,5 @@ - + diff --git a/trunk/dist/game/data/minionData.xml b/trunk/dist/game/data/MinionData.xml similarity index 97% rename from trunk/dist/game/data/minionData.xml rename to trunk/dist/game/data/MinionData.xml index 890b8855b3..ac6c4401f7 100644 --- a/trunk/dist/game/data/minionData.xml +++ b/trunk/dist/game/data/MinionData.xml @@ -1,5 +1,5 @@ - + diff --git a/trunk/dist/game/data/recipes.xml b/trunk/dist/game/data/Recipes.xml similarity index 97% rename from trunk/dist/game/data/recipes.xml rename to trunk/dist/game/data/Recipes.xml index 1ce825a37b..854e0b9e98 100644 --- a/trunk/dist/game/data/recipes.xml +++ b/trunk/dist/game/data/Recipes.xml @@ -6,7 +6,7 @@ - + diff --git a/trunk/dist/game/data/seeds.xml b/trunk/dist/game/data/Seeds.xml similarity index 99% rename from trunk/dist/game/data/seeds.xml rename to trunk/dist/game/data/Seeds.xml index a3031f1962..c5f5bbc6da 100644 --- a/trunk/dist/game/data/seeds.xml +++ b/trunk/dist/game/data/Seeds.xml @@ -1,5 +1,5 @@ - + diff --git a/trunk/dist/game/data/shuttledata.xml b/trunk/dist/game/data/ShuttleData.xml similarity index 94% rename from trunk/dist/game/data/shuttledata.xml rename to trunk/dist/game/data/ShuttleData.xml index 2cf24737a3..322d6560ec 100644 --- a/trunk/dist/game/data/shuttledata.xml +++ b/trunk/dist/game/data/ShuttleData.xml @@ -1,4 +1,4 @@ - + diff --git a/trunk/dist/game/data/skillLearn.xml b/trunk/dist/game/data/SkillLearn.xml similarity index 97% rename from trunk/dist/game/data/skillLearn.xml rename to trunk/dist/game/data/SkillLearn.xml index 723d5b3ea2..371c3df772 100644 --- a/trunk/dist/game/data/skillLearn.xml +++ b/trunk/dist/game/data/SkillLearn.xml @@ -1,5 +1,5 @@ - + 0 1 diff --git a/trunk/dist/game/data/soulCrystalOptions.xml b/trunk/dist/game/data/SoulCrystalOptions.xml similarity index 99% rename from trunk/dist/game/data/soulCrystalOptions.xml rename to trunk/dist/game/data/SoulCrystalOptions.xml index 13c8db767c..840e164586 100644 --- a/trunk/dist/game/data/soulCrystalOptions.xml +++ b/trunk/dist/game/data/SoulCrystalOptions.xml @@ -1,5 +1,5 @@ - +