From 42e1c23bfec570946aa7d52332d18453494a73ca Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Sat, 23 May 2020 11:15:43 +0000 Subject: [PATCH] Destroy subclass certificates from warehouse. Contributed by facab. --- .../data/scripts/ai/areas/TalkingIsland/Trandon/Trandon.java | 2 ++ .../data/scripts/ai/areas/TalkingIsland/Trandon/Trandon.java | 2 ++ .../data/scripts/ai/areas/TalkingIsland/Trandon/Trandon.java | 2 ++ .../data/scripts/ai/areas/TalkingIsland/Trandon/Trandon.java | 2 ++ .../data/scripts/ai/areas/TalkingIsland/Trandon/Trandon.java | 2 ++ .../data/scripts/ai/areas/TalkingIsland/Trandon/Trandon.java | 2 ++ .../data/scripts/ai/areas/TalkingIsland/Trandon/Trandon.java | 2 ++ .../dist/game/data/scripts/ai/areas/Aden/Gallias/Gallias.java | 2 ++ .../data/scripts/ai/areas/TalkingIsland/Trandon/Trandon.java | 2 ++ 9 files changed, 18 insertions(+) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Trandon/Trandon.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Trandon/Trandon.java index 21fd71fc80..283dc32e39 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Trandon/Trandon.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/Trandon/Trandon.java @@ -208,6 +208,7 @@ public class Trandon extends AbstractNpcAI { htmltext = null; // TODO: Unknown html takeItems(player, SUB_CERTIFICATE, -1); + player.getWarehouse().destroyItemByItemId("Quest", SUB_CERTIFICATE, -1, player, true); takeItems(player, Inventory.ADENA_ID, Config.FEE_DELETE_SUBCLASS_SKILLS); for (SubClass subclass : player.getSubClasses().values()) { @@ -317,6 +318,7 @@ public class Trandon extends AbstractNpcAI { htmltext = null; // TODO: Unknown html takeItems(player, DUAL_CERTIFICATE, -1); + player.getWarehouse().destroyItemByItemId("Quest", DUAL_CERTIFICATE, -1, player, true); takeItems(player, Inventory.ADENA_ID, Config.FEE_DELETE_DUALCLASS_SKILLS); player.getVariables().remove(DUAL_CERTIFICATE_COUNT_VAR); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Trandon/Trandon.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Trandon/Trandon.java index 21fd71fc80..283dc32e39 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Trandon/Trandon.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Trandon/Trandon.java @@ -208,6 +208,7 @@ public class Trandon extends AbstractNpcAI { htmltext = null; // TODO: Unknown html takeItems(player, SUB_CERTIFICATE, -1); + player.getWarehouse().destroyItemByItemId("Quest", SUB_CERTIFICATE, -1, player, true); takeItems(player, Inventory.ADENA_ID, Config.FEE_DELETE_SUBCLASS_SKILLS); for (SubClass subclass : player.getSubClasses().values()) { @@ -317,6 +318,7 @@ public class Trandon extends AbstractNpcAI { htmltext = null; // TODO: Unknown html takeItems(player, DUAL_CERTIFICATE, -1); + player.getWarehouse().destroyItemByItemId("Quest", DUAL_CERTIFICATE, -1, player, true); takeItems(player, Inventory.ADENA_ID, Config.FEE_DELETE_DUALCLASS_SKILLS); player.getVariables().remove(DUAL_CERTIFICATE_COUNT_VAR); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Trandon/Trandon.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Trandon/Trandon.java index 21fd71fc80..283dc32e39 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Trandon/Trandon.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Trandon/Trandon.java @@ -208,6 +208,7 @@ public class Trandon extends AbstractNpcAI { htmltext = null; // TODO: Unknown html takeItems(player, SUB_CERTIFICATE, -1); + player.getWarehouse().destroyItemByItemId("Quest", SUB_CERTIFICATE, -1, player, true); takeItems(player, Inventory.ADENA_ID, Config.FEE_DELETE_SUBCLASS_SKILLS); for (SubClass subclass : player.getSubClasses().values()) { @@ -317,6 +318,7 @@ public class Trandon extends AbstractNpcAI { htmltext = null; // TODO: Unknown html takeItems(player, DUAL_CERTIFICATE, -1); + player.getWarehouse().destroyItemByItemId("Quest", DUAL_CERTIFICATE, -1, player, true); takeItems(player, Inventory.ADENA_ID, Config.FEE_DELETE_DUALCLASS_SKILLS); player.getVariables().remove(DUAL_CERTIFICATE_COUNT_VAR); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Trandon/Trandon.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Trandon/Trandon.java index 0d2e10c171..8dd9a02dbf 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Trandon/Trandon.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/Trandon/Trandon.java @@ -208,6 +208,7 @@ public class Trandon extends AbstractNpcAI { htmltext = null; // TODO: Unknown html takeItems(player, SUB_CERTIFICATE, -1); + player.getWarehouse().destroyItemByItemId("Quest", SUB_CERTIFICATE, -1, player, true); takeItems(player, Inventory.ADENA_ID, Config.FEE_DELETE_SUBCLASS_SKILLS); for (SubClass subclass : player.getSubClasses().values()) { @@ -317,6 +318,7 @@ public class Trandon extends AbstractNpcAI { htmltext = null; // TODO: Unknown html takeItems(player, DUAL_CERTIFICATE, -1); + player.getWarehouse().destroyItemByItemId("Quest", DUAL_CERTIFICATE, -1, player, true); takeItems(player, Inventory.ADENA_ID, Config.FEE_DELETE_DUALCLASS_SKILLS); player.getVariables().remove(DUAL_CERTIFICATE_COUNT_VAR); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Trandon/Trandon.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Trandon/Trandon.java index 0d2e10c171..8dd9a02dbf 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Trandon/Trandon.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/TalkingIsland/Trandon/Trandon.java @@ -208,6 +208,7 @@ public class Trandon extends AbstractNpcAI { htmltext = null; // TODO: Unknown html takeItems(player, SUB_CERTIFICATE, -1); + player.getWarehouse().destroyItemByItemId("Quest", SUB_CERTIFICATE, -1, player, true); takeItems(player, Inventory.ADENA_ID, Config.FEE_DELETE_SUBCLASS_SKILLS); for (SubClass subclass : player.getSubClasses().values()) { @@ -317,6 +318,7 @@ public class Trandon extends AbstractNpcAI { htmltext = null; // TODO: Unknown html takeItems(player, DUAL_CERTIFICATE, -1); + player.getWarehouse().destroyItemByItemId("Quest", DUAL_CERTIFICATE, -1, player, true); takeItems(player, Inventory.ADENA_ID, Config.FEE_DELETE_DUALCLASS_SKILLS); player.getVariables().remove(DUAL_CERTIFICATE_COUNT_VAR); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Trandon/Trandon.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Trandon/Trandon.java index 0d2e10c171..8dd9a02dbf 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Trandon/Trandon.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/areas/TalkingIsland/Trandon/Trandon.java @@ -208,6 +208,7 @@ public class Trandon extends AbstractNpcAI { htmltext = null; // TODO: Unknown html takeItems(player, SUB_CERTIFICATE, -1); + player.getWarehouse().destroyItemByItemId("Quest", SUB_CERTIFICATE, -1, player, true); takeItems(player, Inventory.ADENA_ID, Config.FEE_DELETE_SUBCLASS_SKILLS); for (SubClass subclass : player.getSubClasses().values()) { @@ -317,6 +318,7 @@ public class Trandon extends AbstractNpcAI { htmltext = null; // TODO: Unknown html takeItems(player, DUAL_CERTIFICATE, -1); + player.getWarehouse().destroyItemByItemId("Quest", DUAL_CERTIFICATE, -1, player, true); takeItems(player, Inventory.ADENA_ID, Config.FEE_DELETE_DUALCLASS_SKILLS); player.getVariables().remove(DUAL_CERTIFICATE_COUNT_VAR); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Trandon/Trandon.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Trandon/Trandon.java index 0d2e10c171..8dd9a02dbf 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Trandon/Trandon.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/areas/TalkingIsland/Trandon/Trandon.java @@ -208,6 +208,7 @@ public class Trandon extends AbstractNpcAI { htmltext = null; // TODO: Unknown html takeItems(player, SUB_CERTIFICATE, -1); + player.getWarehouse().destroyItemByItemId("Quest", SUB_CERTIFICATE, -1, player, true); takeItems(player, Inventory.ADENA_ID, Config.FEE_DELETE_SUBCLASS_SKILLS); for (SubClass subclass : player.getSubClasses().values()) { @@ -317,6 +318,7 @@ public class Trandon extends AbstractNpcAI { htmltext = null; // TODO: Unknown html takeItems(player, DUAL_CERTIFICATE, -1); + player.getWarehouse().destroyItemByItemId("Quest", DUAL_CERTIFICATE, -1, player, true); takeItems(player, Inventory.ADENA_ID, Config.FEE_DELETE_DUALCLASS_SKILLS); player.getVariables().remove(DUAL_CERTIFICATE_COUNT_VAR); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/Aden/Gallias/Gallias.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/Aden/Gallias/Gallias.java index 5a61c54837..b019d080de 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/Aden/Gallias/Gallias.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/Aden/Gallias/Gallias.java @@ -213,6 +213,7 @@ public class Gallias extends AbstractNpcAI { htmltext = null; // TODO: Unknown html takeItems(player, SUB_CERTIFICATE, -1); + player.getWarehouse().destroyItemByItemId("Quest", SUB_CERTIFICATE, -1, player, true); takeItems(player, Inventory.ADENA_ID, Config.FEE_DELETE_SUBCLASS_SKILLS); for (SubClass subclass : player.getSubClasses().values()) { @@ -322,6 +323,7 @@ public class Gallias extends AbstractNpcAI { htmltext = null; // TODO: Unknown html takeItems(player, DUAL_CERTIFICATE, -1); + player.getWarehouse().destroyItemByItemId("Quest", DUAL_CERTIFICATE, -1, player, true); takeItems(player, Inventory.ADENA_ID, Config.FEE_DELETE_DUALCLASS_SKILLS); player.getVariables().remove(DUAL_CERTIFICATE_COUNT_VAR); diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Trandon/Trandon.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Trandon/Trandon.java index 0d2e10c171..8dd9a02dbf 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Trandon/Trandon.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/TalkingIsland/Trandon/Trandon.java @@ -208,6 +208,7 @@ public class Trandon extends AbstractNpcAI { htmltext = null; // TODO: Unknown html takeItems(player, SUB_CERTIFICATE, -1); + player.getWarehouse().destroyItemByItemId("Quest", SUB_CERTIFICATE, -1, player, true); takeItems(player, Inventory.ADENA_ID, Config.FEE_DELETE_SUBCLASS_SKILLS); for (SubClass subclass : player.getSubClasses().values()) { @@ -317,6 +318,7 @@ public class Trandon extends AbstractNpcAI { htmltext = null; // TODO: Unknown html takeItems(player, DUAL_CERTIFICATE, -1); + player.getWarehouse().destroyItemByItemId("Quest", DUAL_CERTIFICATE, -1, player, true); takeItems(player, Inventory.ADENA_ID, Config.FEE_DELETE_DUALCLASS_SKILLS); player.getVariables().remove(DUAL_CERTIFICATE_COUNT_VAR);