From 46ae40bd54027987cdecd52e37c276941c0a8c3f Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Mon, 12 Apr 2021 07:42:15 +0000 Subject: [PATCH] Updated Game Assistant. Contributed by manax182. --- .../dist/game/data/multisell/3247829.xml | 2 +- .../dist/game/data/multisell/3247830.xml | 74 +++---- .../dist/game/data/multisell/3247831.xml | 32 ++- .../dist/game/data/multisell/3247835.xml | 54 ++--- .../dist/game/data/multisell/3247840.xml | 97 +++++++++ .../dist/game/data/multisell/3247841.xml | 56 +++++ .../ai/others/GameAssistant/32478.html | 8 +- .../others/GameAssistant/GameAssistant.java | 205 ++---------------- .../ai/others/GameAssistant/agathions.html | 22 +- .../ai/others/GameAssistant/armors.html | 78 +++++++ .../ai/others/GameAssistant/events.html | 42 +--- .../ai/others/GameAssistant/items.html | 38 +--- .../ai/others/GameAssistant/weapons.html | 77 +------ 13 files changed, 334 insertions(+), 451 deletions(-) create mode 100644 L2J_Mobius_Essence_5.0_Sylph/dist/game/data/multisell/3247840.xml create mode 100644 L2J_Mobius_Essence_5.0_Sylph/dist/game/data/multisell/3247841.xml create mode 100644 L2J_Mobius_Essence_5.0_Sylph/dist/game/data/scripts/ai/others/GameAssistant/armors.html diff --git a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/multisell/3247829.xml b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/multisell/3247829.xml index da4d00f5b6..5e0fa7fac9 100644 --- a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/multisell/3247829.xml +++ b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/multisell/3247829.xml @@ -3,7 +3,7 @@ -1 - + diff --git a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/multisell/3247830.xml b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/multisell/3247830.xml index 9008c044cb..4869739a64 100644 --- a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/multisell/3247830.xml +++ b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/multisell/3247830.xml @@ -3,77 +3,71 @@ -1 - + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - + + - + - - - - - - - - + + \ No newline at end of file diff --git a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/multisell/3247831.xml b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/multisell/3247831.xml index db62619b26..2603138316 100644 --- a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/multisell/3247831.xml +++ b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/multisell/3247831.xml @@ -3,29 +3,23 @@ -1 - + - - - - + + + + - - - - + + + + - - - - - - - - - - + + + + \ No newline at end of file diff --git a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/multisell/3247835.xml b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/multisell/3247835.xml index f86566f7a7..6c7edd4166 100644 --- a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/multisell/3247835.xml +++ b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/multisell/3247835.xml @@ -6,56 +6,32 @@ - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + \ No newline at end of file diff --git a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/multisell/3247840.xml b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/multisell/3247840.xml new file mode 100644 index 0000000000..86d0bcb869 --- /dev/null +++ b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/multisell/3247840.xml @@ -0,0 +1,97 @@ + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/multisell/3247841.xml b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/multisell/3247841.xml new file mode 100644 index 0000000000..a42152a5bf --- /dev/null +++ b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/multisell/3247841.xml @@ -0,0 +1,56 @@ + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/scripts/ai/others/GameAssistant/32478.html b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/scripts/ai/others/GameAssistant/32478.html index 626b08c553..6a9fb92c9c 100644 --- a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/scripts/ai/others/GameAssistant/32478.html +++ b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/scripts/ai/others/GameAssistant/32478.html @@ -14,6 +14,10 @@ + + + @@ -22,10 +26,6 @@ - - -
+
-
diff --git a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/scripts/ai/others/GameAssistant/GameAssistant.java b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/scripts/ai/others/GameAssistant/GameAssistant.java index 59a5392820..f3c817ee9d 100644 --- a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/scripts/ai/others/GameAssistant/GameAssistant.java +++ b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/scripts/ai/others/GameAssistant/GameAssistant.java @@ -57,27 +57,8 @@ public class GameAssistant extends AbstractNpcAI // Multisells private static final int ATTENDANCE_REWARD_MULTISELL = 3247801; // - private static final int SIGEL_SOUL_CRYSTAL = 3247802; - private static final int TYRR_SOUL_CRYSTAL = 3247803; - private static final int OTHELL_SOUL_CRYSTAL = 3247804; - private static final int YUL_SOUL_CRYSTAL = 3247805; - private static final int FEOH_SOUL_CRYSTAL = 3247806; - private static final int ISS_SOUL_CRYSTAL = 3247807; - private static final int WYNN_SOUL_CRYSTAL = 3247808; - private static final int AEORE_SOUL_CRYSTAL = 3247809; - // - private static final int EX_SAYHA_BLESSING_SHOP = 3247810; - private static final int EX_GIRAN_SEALS_SHOP = 3247811; - private static final int EX_DOLL_7DAYS_SHOP = 3247812; private static final int EX_BOSS_WEAPON_SHOP = 3247813; - // - private static final int EX_MYSTERIUS_LEVEL2 = 3247814; - private static final int EX_MYSTERIUS_LEVEL3 = 3247815; - private static final int EX_MYSTERIUS_LEVEL4 = 3247816; - private static final int EX_MYSTERIUS_LEVEL5 = 3247817; - private static final int EX_MYSTERIUS_LEVEL6 = 3247818; - private static final int EX_MYSTERIUS_LEVEL7 = 3247819; - private static final int EX_MYSTERIUS_LEVEL8 = 3247820; + private static final int EX_LA_VIE_EN_ROSE = 3247841; // private static final int EX_HEAVY_A_GRADE = 3247821; private static final int EX_LIGHT_A_GRADE = 3247822; @@ -88,16 +69,11 @@ public class GameAssistant extends AbstractNpcAI private static final int EX_LIGHT_B_GRADE = 3247827; private static final int EX_ROBE_B_GRADE = 3247828; private static final int EX_WEAPON_B_GRADE = 3247829; - private static final int EX_WEAPON_C_GRADE = 3247830; - private static final int EX_SAYHA_CLOAK = 3247831; - private static final int EX_SAYAHA_CLOAK_PROTECTION = 3247832; - private static final int EX_TALISMAN = 3247833; - private static final int EX_AGATHION_BRACELET = 3247834; + private static final int EX_WEAPON_7_B_GRADE = 3247840; + private static final int EX_ARMOR_C_GRADE = 3247830; + private static final int EX_ARMOR_4_C_GRADE = 3247831; private static final int EX_AGATHION_SPIRIT = 3247835; - private static final int EX_PENDANT = 3247836; - private static final int EX_BUFF_SCROLL = 3247837; private static final int EX_SOULSHOT = 3247838; - private static final int EX_ENCHANTS = 3247839; // Others private static final String COMMAND_BYPASS = "Quest GameAssistant "; @@ -212,61 +188,23 @@ public class GameAssistant extends AbstractNpcAI player.sendPacket(new ExPremiumManagerShowHtml(HtmCache.getInstance().getHtm(player, "data/scripts/ai/others/GameAssistant/weapons.html"))); break; } - case "Chat_Cloaks": + case "Chat_Armors": { - player.sendPacket(new ExPremiumManagerShowHtml(HtmCache.getInstance().getHtm(player, "data/scripts/ai/others/GameAssistant/cloaks.html"))); - break; - } - case "Chat_ProtectionCloaks": - { - player.sendPacket(new ExPremiumManagerShowHtml(HtmCache.getInstance().getHtm(player, "data/scripts/ai/others/GameAssistant/protectioncloaks.html"))); - break; - } - case "Chat_ProtectionCloaks_Black": - { - player.sendPacket(new ExPremiumManagerShowHtml(HtmCache.getInstance().getHtm(player, "data/scripts/ai/others/GameAssistant/blackprotectioncloaks.html"))); - break; - } - case "Chat_ProtectionCloaks_White": - { - player.sendPacket(new ExPremiumManagerShowHtml(HtmCache.getInstance().getHtm(player, "data/scripts/ai/others/GameAssistant/whiteprotectioncloaks.html"))); - break; - } - case "Chat_ProtectionCloaks_Red": - { - player.sendPacket(new ExPremiumManagerShowHtml(HtmCache.getInstance().getHtm(player, "data/scripts/ai/others/GameAssistant/redprotectcloaks.html"))); - break; - } - case "Chat_Talismans": - { - player.sendPacket(new ExPremiumManagerShowHtml(HtmCache.getInstance().getHtm(player, "data/scripts/ai/others/GameAssistant/talismans.html"))); + player.sendPacket(new ExPremiumManagerShowHtml(HtmCache.getInstance().getHtm(player, "data/scripts/ai/others/GameAssistant/armors.html"))); break; } + case "Chat_Agathions": { player.sendPacket(new ExPremiumManagerShowHtml(HtmCache.getInstance().getHtm(player, "data/scripts/ai/others/GameAssistant/agathions.html"))); break; } - case "Chat_Pendants": - { - player.sendPacket(new ExPremiumManagerShowHtml(HtmCache.getInstance().getHtm(player, "data/scripts/ai/others/GameAssistant/pendants.html"))); - break; - } - case "Chat_BuffScrolls": - { - player.sendPacket(new ExPremiumManagerShowHtml(HtmCache.getInstance().getHtm(player, "data/scripts/ai/others/GameAssistant/buffscrolls.html"))); - break; - } + case "Chat_Soulshots": { player.sendPacket(new ExPremiumManagerShowHtml(HtmCache.getInstance().getHtm(player, "data/scripts/ai/others/GameAssistant/soulshots.html"))); break; } - case "Chat_Enchants": - { - player.sendPacket(new ExPremiumManagerShowHtml(HtmCache.getInstance().getHtm(player, "data/scripts/ai/others/GameAssistant/enchants.html"))); - break; - } // Actions case "removeAug": { @@ -290,100 +228,14 @@ public class GameAssistant extends AbstractNpcAI break; } // Multisell - case "SigelSC_Shop": - { - MultisellData.getInstance().separateAndSend(SIGEL_SOUL_CRYSTAL, player, null, false); - break; - } - case "TyrrSC_Shop": - { - MultisellData.getInstance().separateAndSend(TYRR_SOUL_CRYSTAL, player, null, false); - break; - } - case "OthellSC_Shop": - { - MultisellData.getInstance().separateAndSend(OTHELL_SOUL_CRYSTAL, player, null, false); - break; - } - case "YulSC_Shop": - { - MultisellData.getInstance().separateAndSend(YUL_SOUL_CRYSTAL, player, null, false); - break; - } - case "FeohSC_Shop": - { - MultisellData.getInstance().separateAndSend(FEOH_SOUL_CRYSTAL, player, null, false); - break; - } - case "IssSC_Shop": - { - MultisellData.getInstance().separateAndSend(ISS_SOUL_CRYSTAL, player, null, false); - break; - } - case "WynnSC_Shop": - { - MultisellData.getInstance().separateAndSend(WYNN_SOUL_CRYSTAL, player, null, false); - break; - } - case "AeoreSC_Shop": - { - MultisellData.getInstance().separateAndSend(AEORE_SOUL_CRYSTAL, player, null, false); - break; - } - - case "Ex_Sayha_BlessingShop": - { - MultisellData.getInstance().separateAndSend(EX_SAYHA_BLESSING_SHOP, player, null, false); - break; - } - case "EX_GiranSealsShop": - { - MultisellData.getInstance().separateAndSend(EX_GIRAN_SEALS_SHOP, player, null, false); - break; - } - case "Ex_Doll7DayShop": - { - MultisellData.getInstance().separateAndSend(EX_DOLL_7DAYS_SHOP, player, null, false); - break; - } case "Ex_BossWeapFragShop": { MultisellData.getInstance().separateAndSend(EX_BOSS_WEAPON_SHOP, player, null, false); break; } - case "Ex_MysteriousLv2Shop": + case "Ex_LaVieEnRoseShop": { - MultisellData.getInstance().separateAndSend(EX_MYSTERIUS_LEVEL2, player, null, false); - break; - } - case "Ex_MysteriousLv3Shop": - { - MultisellData.getInstance().separateAndSend(EX_MYSTERIUS_LEVEL3, player, null, false); - break; - } - case "Ex_MysteriousLv4Shop": - { - MultisellData.getInstance().separateAndSend(EX_MYSTERIUS_LEVEL4, player, null, false); - break; - } - case "Ex_MysteriousLv5Shop": - { - MultisellData.getInstance().separateAndSend(EX_MYSTERIUS_LEVEL5, player, null, false); - break; - } - case "Ex_MysteriousLv6Shop": - { - MultisellData.getInstance().separateAndSend(EX_MYSTERIUS_LEVEL6, player, null, false); - break; - } - case "Ex_MysteriousLv7Shop": - { - MultisellData.getInstance().separateAndSend(EX_MYSTERIUS_LEVEL7, player, null, false); - break; - } - case "Ex_MysteriousLv8Shop": - { - MultisellData.getInstance().separateAndSend(EX_MYSTERIUS_LEVEL8, player, null, false); + MultisellData.getInstance().separateAndSend(EX_LA_VIE_EN_ROSE, player, null, false); break; } case "Ex_HeavyAGrade": @@ -431,29 +283,19 @@ public class GameAssistant extends AbstractNpcAI MultisellData.getInstance().separateAndSend(EX_WEAPON_B_GRADE, player, null, false); break; } - case "Ex_WeaponCgrade": + case "Ex_Weapon7Bgrade": { - MultisellData.getInstance().separateAndSend(EX_WEAPON_C_GRADE, player, null, false); + MultisellData.getInstance().separateAndSend(EX_WEAPON_7_B_GRADE, player, null, false); break; } - case "Ex_SayhaCloak": + case "Ex_ArmorCgrade": { - MultisellData.getInstance().separateAndSend(EX_SAYHA_CLOAK, player, null, false); + MultisellData.getInstance().separateAndSend(EX_ARMOR_C_GRADE, player, null, false); break; } - case "Ex_SayhaProtection": + case "Ex_Armor4Cgrade": { - MultisellData.getInstance().separateAndSend(EX_SAYAHA_CLOAK_PROTECTION, player, null, false); - break; - } - case "Ex_Talisman": - { - MultisellData.getInstance().separateAndSend(EX_TALISMAN, player, null, false); - break; - } - case "Ex_AgathionBracelet": - { - MultisellData.getInstance().separateAndSend(EX_AGATHION_BRACELET, player, null, false); + MultisellData.getInstance().separateAndSend(EX_ARMOR_4_C_GRADE, player, null, false); break; } case "Ex_AgathionSpirit": @@ -461,26 +303,11 @@ public class GameAssistant extends AbstractNpcAI MultisellData.getInstance().separateAndSend(EX_AGATHION_SPIRIT, player, null, false); break; } - case "Ex_Pendant": - { - MultisellData.getInstance().separateAndSend(EX_PENDANT, player, null, false); - break; - } - case "Ex_BuffScroll": - { - MultisellData.getInstance().separateAndSend(EX_BUFF_SCROLL, player, null, false); - break; - } case "Ex_Soulshot": { MultisellData.getInstance().separateAndSend(EX_SOULSHOT, player, null, false); break; } - case "Ex_Enchants": - { - MultisellData.getInstance().separateAndSend(EX_ENCHANTS, player, null, false); - break; - } case "exc_black_sayha_cloak": { final long itemCount = getQuestItemsCount(player, SAYHA_CLOAK_COUPON); diff --git a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/scripts/ai/others/GameAssistant/agathions.html b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/scripts/ai/others/GameAssistant/agathions.html index 9ce510b983..5bd894b5a3 100644 --- a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/scripts/ai/others/GameAssistant/agathions.html +++ b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/scripts/ai/others/GameAssistant/agathions.html @@ -20,7 +20,7 @@ - How to use Agathion Exchange Coupons. + Get Agathion Spirit @@ -29,25 +29,7 @@ - -
- -
- - - - - - - - - - -
Agathion Spirit cannot be exchange or sold.
- - -
- +
diff --git a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/scripts/ai/others/GameAssistant/armors.html b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/scripts/ai/others/GameAssistant/armors.html new file mode 100644 index 0000000000..4522625658 --- /dev/null +++ b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/scripts/ai/others/GameAssistant/armors.html @@ -0,0 +1,78 @@ + + + + + + + + + + +
+ + + + +

+ You can use Armor Exchange Coupons.

+ + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ + + + +
+
+ + \ No newline at end of file diff --git a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/scripts/ai/others/GameAssistant/events.html b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/scripts/ai/others/GameAssistant/events.html index 44b34ae7b9..be43401507 100644 --- a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/scripts/ai/others/GameAssistant/events.html +++ b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/scripts/ai/others/GameAssistant/events.html @@ -12,49 +12,13 @@ - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +
Event
Exchange available until February 10,2021.
Exchange available until February 27,2021.
diff --git a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/scripts/ai/others/GameAssistant/items.html b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/scripts/ai/others/GameAssistant/items.html index 5ef6b07944..2bf5aa8d11 100644 --- a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/scripts/ai/others/GameAssistant/items.html +++ b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/scripts/ai/others/GameAssistant/items.html @@ -25,7 +25,7 @@
@@ -33,15 +33,7 @@ - - - - - - @@ -57,31 +49,7 @@ - - - - - - - - - - - - - - - - - - diff --git a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/scripts/ai/others/GameAssistant/weapons.html b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/scripts/ai/others/GameAssistant/weapons.html index 6fc545a274..38e0b1c457 100644 --- a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/scripts/ai/others/GameAssistant/weapons.html +++ b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/scripts/ai/others/GameAssistant/weapons.html @@ -10,39 +10,34 @@ - - - - - - -
-
-
-
-
-
-
-
- +

- Here you can use various coupons.
+ You can use Weapon Exchange Coupons.

- - - - - -
Trade A-grade equipment
- - + + + + +
- - - - - +
- +
- + +
+
@@ -50,54 +45,6 @@
Trade B-grade equipment
- - - - - - - - - - - - -
- - - - - -
- -
- - - - - - - - - - -
Trade C-grade equipment
- - - - - - -
- -