From 3da292017a95e925a7519dc8ef7e50fb82f6c2de Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Wed, 12 May 2021 21:48:22 +0000 Subject: [PATCH] Match Vip.xml naming with other data files. --- .../dist/game/data/{vip.xml => Vip.xml} | 4 +- .../gameserver/data/xml/VipData.java | 5 +- .../dist/game/data/{vip.xml => Vip.xml} | 4 +- .../gameserver/data/xml/VipData.java | 5 +- .../dist/game/data/{vip.xml => Vip.xml} | 4 +- .../gameserver/data/xml/VipData.java | 5 +- .../dist/game/data/{vip.xml => Vip.xml} | 4 +- .../gameserver/data/xml/VipData.java | 5 +- .../dist/game/data/Vip.xml | 56 ++++++++++ .../dist/game/data/vip.xml | 58 ---------- .../gameserver/data/xml/VipData.java | 5 +- .../dist/game/data/{vip.xml => Vip.xml} | 4 +- .../gameserver/data/xml/VipData.java | 5 +- .../dist/game/data/{vip.xml => Vip.xml} | 104 +----------------- .../gameserver/data/xml/VipData.java | 5 +- .../dist/game/data/{vip.xml => Vip.xml} | 104 +----------------- .../gameserver/data/xml/VipData.java | 5 +- 17 files changed, 71 insertions(+), 311 deletions(-) rename L2J_Mobius_Classic_2.0_Saviors/dist/game/data/{vip.xml => Vip.xml} (97%) rename L2J_Mobius_Classic_2.1_Zaken/dist/game/data/{vip.xml => Vip.xml} (97%) rename L2J_Mobius_Classic_2.2_Antharas/dist/game/data/{vip.xml => Vip.xml} (97%) rename L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/{vip.xml => Vip.xml} (97%) create mode 100644 L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/Vip.xml delete mode 100644 L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/vip.xml rename L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/{vip.xml => Vip.xml} (98%) rename L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/{vip.xml => Vip.xml} (87%) rename L2J_Mobius_Essence_5.0_Sylph/dist/game/data/{vip.xml => Vip.xml} (87%) diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/vip.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/Vip.xml similarity index 97% rename from L2J_Mobius_Classic_2.0_Saviors/dist/game/data/vip.xml rename to L2J_Mobius_Classic_2.0_Saviors/dist/game/data/Vip.xml index 1154e204af..e84e531bf9 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/vip.xml +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/Vip.xml @@ -27,10 +27,8 @@ product_name_begin id=2090048 outer_name=[Normal VIP Gain Scroll] description=[] product_name_begin id=2090049 outer_name=[Medium VIP Gain Scroll] description=[] icon=[BranchIcon.Icon.g_bm_vip_potion_i00] icon_panel=[None] mainsubject=[] product_name_end product_name_begin id=2090050 outer_name=[Good VIP Gain Scroll] description=[] icon=[BranchIcon.Icon.g_bm_vip_potion_i00] icon_panel=[None] mainsubject=[] product_name_end product_name_begin id=2090051 outer_name=[Perfect VIP Gain Scroll] description=[] icon=[BranchIcon.Icon.g_bm_vip_potion_i00] icon_panel=[None] mainsubject=[] product_name_end +--> - - --> - diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/VipData.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/VipData.java index 243c3d285d..6036bad644 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/VipData.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/VipData.java @@ -51,7 +51,7 @@ public class VipData implements IXmlReader return; } _vipTiers.clear(); - parseDatapackFile("data/vip.xml"); + parseDatapackFile("data/Vip.xml"); LOGGER.info(getClass().getSimpleName() + ": Loaded " + _vipTiers.size() + " vips."); } @@ -86,7 +86,6 @@ public class VipData implements IXmlReader LOGGER.severe(getClass().getSimpleName() + ": Missing points-required for vip: " + tier + ", skipping"); continue; } - required = Integer.parseInt(att.getNodeValue()); att = attrs.getNamedItem("points-lose"); @@ -95,11 +94,9 @@ public class VipData implements IXmlReader LOGGER.severe(getClass().getSimpleName() + ": Missing points-lose for vip: " + tier + ", skipping"); continue; } - lose = Integer.parseInt(att.getNodeValue()); final VipInfo vipInfo = new VipInfo(tier, required, lose); - for (Node c = d.getFirstChild(); c != null; c = c.getNextSibling()) { if ("bonus".equalsIgnoreCase(c.getNodeName())) diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/vip.xml b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/Vip.xml similarity index 97% rename from L2J_Mobius_Classic_2.1_Zaken/dist/game/data/vip.xml rename to L2J_Mobius_Classic_2.1_Zaken/dist/game/data/Vip.xml index 1154e204af..e84e531bf9 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/vip.xml +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/Vip.xml @@ -27,10 +27,8 @@ product_name_begin id=2090048 outer_name=[Normal VIP Gain Scroll] description=[] product_name_begin id=2090049 outer_name=[Medium VIP Gain Scroll] description=[] icon=[BranchIcon.Icon.g_bm_vip_potion_i00] icon_panel=[None] mainsubject=[] product_name_end product_name_begin id=2090050 outer_name=[Good VIP Gain Scroll] description=[] icon=[BranchIcon.Icon.g_bm_vip_potion_i00] icon_panel=[None] mainsubject=[] product_name_end product_name_begin id=2090051 outer_name=[Perfect VIP Gain Scroll] description=[] icon=[BranchIcon.Icon.g_bm_vip_potion_i00] icon_panel=[None] mainsubject=[] product_name_end +--> - - --> - diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/VipData.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/VipData.java index 243c3d285d..6036bad644 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/VipData.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/VipData.java @@ -51,7 +51,7 @@ public class VipData implements IXmlReader return; } _vipTiers.clear(); - parseDatapackFile("data/vip.xml"); + parseDatapackFile("data/Vip.xml"); LOGGER.info(getClass().getSimpleName() + ": Loaded " + _vipTiers.size() + " vips."); } @@ -86,7 +86,6 @@ public class VipData implements IXmlReader LOGGER.severe(getClass().getSimpleName() + ": Missing points-required for vip: " + tier + ", skipping"); continue; } - required = Integer.parseInt(att.getNodeValue()); att = attrs.getNamedItem("points-lose"); @@ -95,11 +94,9 @@ public class VipData implements IXmlReader LOGGER.severe(getClass().getSimpleName() + ": Missing points-lose for vip: " + tier + ", skipping"); continue; } - lose = Integer.parseInt(att.getNodeValue()); final VipInfo vipInfo = new VipInfo(tier, required, lose); - for (Node c = d.getFirstChild(); c != null; c = c.getNextSibling()) { if ("bonus".equalsIgnoreCase(c.getNodeName())) diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/vip.xml b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/Vip.xml similarity index 97% rename from L2J_Mobius_Classic_2.2_Antharas/dist/game/data/vip.xml rename to L2J_Mobius_Classic_2.2_Antharas/dist/game/data/Vip.xml index 1154e204af..e84e531bf9 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/vip.xml +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/Vip.xml @@ -27,10 +27,8 @@ product_name_begin id=2090048 outer_name=[Normal VIP Gain Scroll] description=[] product_name_begin id=2090049 outer_name=[Medium VIP Gain Scroll] description=[] icon=[BranchIcon.Icon.g_bm_vip_potion_i00] icon_panel=[None] mainsubject=[] product_name_end product_name_begin id=2090050 outer_name=[Good VIP Gain Scroll] description=[] icon=[BranchIcon.Icon.g_bm_vip_potion_i00] icon_panel=[None] mainsubject=[] product_name_end product_name_begin id=2090051 outer_name=[Perfect VIP Gain Scroll] description=[] icon=[BranchIcon.Icon.g_bm_vip_potion_i00] icon_panel=[None] mainsubject=[] product_name_end +--> - - --> - diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/VipData.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/VipData.java index 243c3d285d..6036bad644 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/VipData.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/VipData.java @@ -51,7 +51,7 @@ public class VipData implements IXmlReader return; } _vipTiers.clear(); - parseDatapackFile("data/vip.xml"); + parseDatapackFile("data/Vip.xml"); LOGGER.info(getClass().getSimpleName() + ": Loaded " + _vipTiers.size() + " vips."); } @@ -86,7 +86,6 @@ public class VipData implements IXmlReader LOGGER.severe(getClass().getSimpleName() + ": Missing points-required for vip: " + tier + ", skipping"); continue; } - required = Integer.parseInt(att.getNodeValue()); att = attrs.getNamedItem("points-lose"); @@ -95,11 +94,9 @@ public class VipData implements IXmlReader LOGGER.severe(getClass().getSimpleName() + ": Missing points-lose for vip: " + tier + ", skipping"); continue; } - lose = Integer.parseInt(att.getNodeValue()); final VipInfo vipInfo = new VipInfo(tier, required, lose); - for (Node c = d.getFirstChild(); c != null; c = c.getNextSibling()) { if ("bonus".equalsIgnoreCase(c.getNodeName())) diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/vip.xml b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/Vip.xml similarity index 97% rename from L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/vip.xml rename to L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/Vip.xml index 1154e204af..e84e531bf9 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/vip.xml +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/Vip.xml @@ -27,10 +27,8 @@ product_name_begin id=2090048 outer_name=[Normal VIP Gain Scroll] description=[] product_name_begin id=2090049 outer_name=[Medium VIP Gain Scroll] description=[] icon=[BranchIcon.Icon.g_bm_vip_potion_i00] icon_panel=[None] mainsubject=[] product_name_end product_name_begin id=2090050 outer_name=[Good VIP Gain Scroll] description=[] icon=[BranchIcon.Icon.g_bm_vip_potion_i00] icon_panel=[None] mainsubject=[] product_name_end product_name_begin id=2090051 outer_name=[Perfect VIP Gain Scroll] description=[] icon=[BranchIcon.Icon.g_bm_vip_potion_i00] icon_panel=[None] mainsubject=[] product_name_end +--> - - --> - diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/VipData.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/VipData.java index 243c3d285d..6036bad644 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/VipData.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/VipData.java @@ -51,7 +51,7 @@ public class VipData implements IXmlReader return; } _vipTiers.clear(); - parseDatapackFile("data/vip.xml"); + parseDatapackFile("data/Vip.xml"); LOGGER.info(getClass().getSimpleName() + ": Loaded " + _vipTiers.size() + " vips."); } @@ -86,7 +86,6 @@ public class VipData implements IXmlReader LOGGER.severe(getClass().getSimpleName() + ": Missing points-required for vip: " + tier + ", skipping"); continue; } - required = Integer.parseInt(att.getNodeValue()); att = attrs.getNamedItem("points-lose"); @@ -95,11 +94,9 @@ public class VipData implements IXmlReader LOGGER.severe(getClass().getSimpleName() + ": Missing points-lose for vip: " + tier + ", skipping"); continue; } - lose = Integer.parseInt(att.getNodeValue()); final VipInfo vipInfo = new VipInfo(tier, required, lose); - for (Node c = d.getFirstChild(); c != null; c = c.getNextSibling()) { if ("bonus".equalsIgnoreCase(c.getNodeName())) diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/Vip.xml b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/Vip.xml new file mode 100644 index 0000000000..e84e531bf9 --- /dev/null +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/Vip.xml @@ -0,0 +1,56 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/vip.xml b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/vip.xml deleted file mode 100644 index 1154e204af..0000000000 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/vip.xml +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/VipData.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/VipData.java index 243c3d285d..6036bad644 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/VipData.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/VipData.java @@ -51,7 +51,7 @@ public class VipData implements IXmlReader return; } _vipTiers.clear(); - parseDatapackFile("data/vip.xml"); + parseDatapackFile("data/Vip.xml"); LOGGER.info(getClass().getSimpleName() + ": Loaded " + _vipTiers.size() + " vips."); } @@ -86,7 +86,6 @@ public class VipData implements IXmlReader LOGGER.severe(getClass().getSimpleName() + ": Missing points-required for vip: " + tier + ", skipping"); continue; } - required = Integer.parseInt(att.getNodeValue()); att = attrs.getNamedItem("points-lose"); @@ -95,11 +94,9 @@ public class VipData implements IXmlReader LOGGER.severe(getClass().getSimpleName() + ": Missing points-lose for vip: " + tier + ", skipping"); continue; } - lose = Integer.parseInt(att.getNodeValue()); final VipInfo vipInfo = new VipInfo(tier, required, lose); - for (Node c = d.getFirstChild(); c != null; c = c.getNextSibling()) { if ("bonus".equalsIgnoreCase(c.getNodeName())) diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/vip.xml b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/Vip.xml similarity index 98% rename from L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/vip.xml rename to L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/Vip.xml index c557eb6238..72b3a4f242 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/vip.xml +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/Vip.xml @@ -31,10 +31,8 @@ product_name_begin id=2090052 outer_name=[VIP Gain Scroll - 80] description=[] i product_name_begin id=2090053 outer_name=[VIP Gain Scroll - 240] description=[] icon=[BranchIcon.Icon.g_bm_vip_potion_i00] icon_panel=[None] mainsubject=[] product_name_end product_name_begin id=2090054 outer_name=[VIP Gain Scroll - 800] description=[] icon=[BranchIcon.Icon.g_bm_vip_potion_i00] icon_panel=[None] mainsubject=[] product_name_end product_name_begin id=2090055 outer_name=[VIP Gain Scroll - 2400] description=[] icon=[BranchIcon.Icon.g_bm_vip_potion_i00] icon_panel=[None] mainsubject=[] product_name_end +--> - - --> - diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/VipData.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/VipData.java index 243c3d285d..6036bad644 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/VipData.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/VipData.java @@ -51,7 +51,7 @@ public class VipData implements IXmlReader return; } _vipTiers.clear(); - parseDatapackFile("data/vip.xml"); + parseDatapackFile("data/Vip.xml"); LOGGER.info(getClass().getSimpleName() + ": Loaded " + _vipTiers.size() + " vips."); } @@ -86,7 +86,6 @@ public class VipData implements IXmlReader LOGGER.severe(getClass().getSimpleName() + ": Missing points-required for vip: " + tier + ", skipping"); continue; } - required = Integer.parseInt(att.getNodeValue()); att = attrs.getNamedItem("points-lose"); @@ -95,11 +94,9 @@ public class VipData implements IXmlReader LOGGER.severe(getClass().getSimpleName() + ": Missing points-lose for vip: " + tier + ", skipping"); continue; } - lose = Integer.parseInt(att.getNodeValue()); final VipInfo vipInfo = new VipInfo(tier, required, lose); - for (Node c = d.getFirstChild(); c != null; c = c.getNextSibling()) { if ("bonus".equalsIgnoreCase(c.getNodeName())) diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/vip.xml b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/Vip.xml similarity index 87% rename from L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/vip.xml rename to L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/Vip.xml index a797c36aab..18f668a46f 100644 --- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/vip.xml +++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/Vip.xml @@ -105,10 +105,8 @@ Skillgrp_ClassicAden.dat [Sylph] skill_begin skill_id=59723 skill_level=1 skill_sublevel=0 icon_type=40 icon_hide=0 MagicType=default operate_type=2 mp_consume=0 cast_range=-1 cast_style=0 hit_time=0.0 cool_time=0.0 reuse_delay=0.0 effect_point=0 is_magic=0 origin_skill=0 is_double=0 animation={[None]} skill_visual_effect=[None] icon=[BranchIcon.Icon.g_skill_vip8] icon_panel=[None] debuff=0 resist_cast=0 enchant_skill_level=0 enchant_icon=[None] hp_consume=0 rumble_self=-1 rumble_target=-1 level_hide=0 dp_consume=0 energy_consume=0 dbdelete=0 abnormal_time=0 trait_type=None target_type=none affect_scope=none skill_end skill_begin skill_id=59724 skill_level=1 skill_sublevel=0 icon_type=40 icon_hide=0 MagicType=default operate_type=2 mp_consume=0 cast_range=-1 cast_style=0 hit_time=0.0 cool_time=0.0 reuse_delay=0.0 effect_point=0 is_magic=0 origin_skill=0 is_double=0 animation={[None]} skill_visual_effect=[None] icon=[BranchIcon.Icon.g_skill_vip9] icon_panel=[None] debuff=0 resist_cast=0 enchant_skill_level=0 enchant_icon=[None] hp_consume=0 rumble_self=-1 rumble_target=-1 level_hide=0 dp_consume=0 energy_consume=0 dbdelete=0 abnormal_time=0 trait_type=None target_type=none affect_scope=none skill_end skill_begin skill_id=59725 skill_level=1 skill_sublevel=0 icon_type=40 icon_hide=0 MagicType=default operate_type=2 mp_consume=0 cast_range=-1 cast_style=0 hit_time=0.0 cool_time=0.0 reuse_delay=0.0 effect_point=0 is_magic=0 origin_skill=0 is_double=0 animation={[None]} skill_visual_effect=[None] icon=[BranchIcon.Icon.g_skill_vip10] icon_panel=[None] debuff=0 resist_cast=0 enchant_skill_level=0 enchant_icon=[None] hp_consume=0 rumble_self=-1 rumble_target=-1 level_hide=0 dp_consume=0 energy_consume=0 dbdelete=0 abnormal_time=0 trait_type=None target_type=none affect_scope=none skill_end +--> - - --> - @@ -143,103 +141,3 @@ skill_begin skill_id=59725 skill_level=1 skill_sublevel=0 icon_type=40 icon_hide - - - \ No newline at end of file diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/VipData.java b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/VipData.java index f5321c909d..6ad1549ffc 100644 --- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/VipData.java +++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/VipData.java @@ -51,7 +51,7 @@ public class VipData implements IXmlReader return; } _vipTiers.clear(); - parseDatapackFile("data/vip.xml"); + parseDatapackFile("data/Vip.xml"); LOGGER.info(getClass().getSimpleName() + ": Loaded " + _vipTiers.size() + " vips."); } @@ -86,7 +86,6 @@ public class VipData implements IXmlReader LOGGER.severe(getClass().getSimpleName() + ": Missing points-required for vip: " + tier + ", skipping"); continue; } - required = Integer.parseInt(att.getNodeValue()); att = attrs.getNamedItem("points-lose"); @@ -95,11 +94,9 @@ public class VipData implements IXmlReader LOGGER.severe(getClass().getSimpleName() + ": Missing points-lose for vip: " + tier + ", skipping"); continue; } - lose = Integer.parseInt(att.getNodeValue()); final VipInfo vipInfo = new VipInfo(tier, required, lose); - for (Node c = d.getFirstChild(); c != null; c = c.getNextSibling()) { if ("bonus".equalsIgnoreCase(c.getNodeName())) diff --git a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/vip.xml b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/Vip.xml similarity index 87% rename from L2J_Mobius_Essence_5.0_Sylph/dist/game/data/vip.xml rename to L2J_Mobius_Essence_5.0_Sylph/dist/game/data/Vip.xml index a797c36aab..18f668a46f 100644 --- a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/vip.xml +++ b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/Vip.xml @@ -105,10 +105,8 @@ Skillgrp_ClassicAden.dat [Sylph] skill_begin skill_id=59723 skill_level=1 skill_sublevel=0 icon_type=40 icon_hide=0 MagicType=default operate_type=2 mp_consume=0 cast_range=-1 cast_style=0 hit_time=0.0 cool_time=0.0 reuse_delay=0.0 effect_point=0 is_magic=0 origin_skill=0 is_double=0 animation={[None]} skill_visual_effect=[None] icon=[BranchIcon.Icon.g_skill_vip8] icon_panel=[None] debuff=0 resist_cast=0 enchant_skill_level=0 enchant_icon=[None] hp_consume=0 rumble_self=-1 rumble_target=-1 level_hide=0 dp_consume=0 energy_consume=0 dbdelete=0 abnormal_time=0 trait_type=None target_type=none affect_scope=none skill_end skill_begin skill_id=59724 skill_level=1 skill_sublevel=0 icon_type=40 icon_hide=0 MagicType=default operate_type=2 mp_consume=0 cast_range=-1 cast_style=0 hit_time=0.0 cool_time=0.0 reuse_delay=0.0 effect_point=0 is_magic=0 origin_skill=0 is_double=0 animation={[None]} skill_visual_effect=[None] icon=[BranchIcon.Icon.g_skill_vip9] icon_panel=[None] debuff=0 resist_cast=0 enchant_skill_level=0 enchant_icon=[None] hp_consume=0 rumble_self=-1 rumble_target=-1 level_hide=0 dp_consume=0 energy_consume=0 dbdelete=0 abnormal_time=0 trait_type=None target_type=none affect_scope=none skill_end skill_begin skill_id=59725 skill_level=1 skill_sublevel=0 icon_type=40 icon_hide=0 MagicType=default operate_type=2 mp_consume=0 cast_range=-1 cast_style=0 hit_time=0.0 cool_time=0.0 reuse_delay=0.0 effect_point=0 is_magic=0 origin_skill=0 is_double=0 animation={[None]} skill_visual_effect=[None] icon=[BranchIcon.Icon.g_skill_vip10] icon_panel=[None] debuff=0 resist_cast=0 enchant_skill_level=0 enchant_icon=[None] hp_consume=0 rumble_self=-1 rumble_target=-1 level_hide=0 dp_consume=0 energy_consume=0 dbdelete=0 abnormal_time=0 trait_type=None target_type=none affect_scope=none skill_end +--> - - --> - @@ -143,103 +141,3 @@ skill_begin skill_id=59725 skill_level=1 skill_sublevel=0 icon_type=40 icon_hide - - - \ No newline at end of file diff --git a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/data/xml/VipData.java b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/data/xml/VipData.java index f5321c909d..6ad1549ffc 100644 --- a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/data/xml/VipData.java +++ b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/data/xml/VipData.java @@ -51,7 +51,7 @@ public class VipData implements IXmlReader return; } _vipTiers.clear(); - parseDatapackFile("data/vip.xml"); + parseDatapackFile("data/Vip.xml"); LOGGER.info(getClass().getSimpleName() + ": Loaded " + _vipTiers.size() + " vips."); } @@ -86,7 +86,6 @@ public class VipData implements IXmlReader LOGGER.severe(getClass().getSimpleName() + ": Missing points-required for vip: " + tier + ", skipping"); continue; } - required = Integer.parseInt(att.getNodeValue()); att = attrs.getNamedItem("points-lose"); @@ -95,11 +94,9 @@ public class VipData implements IXmlReader LOGGER.severe(getClass().getSimpleName() + ": Missing points-lose for vip: " + tier + ", skipping"); continue; } - lose = Integer.parseInt(att.getNodeValue()); final VipInfo vipInfo = new VipInfo(tier, required, lose); - for (Node c = d.getFirstChild(); c != null; c = c.getNextSibling()) { if ("bonus".equalsIgnoreCase(c.getNodeName()))