diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/multisell/4039.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/multisell/4039.xml new file mode 100644 index 0000000000..2c089c00fa --- /dev/null +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/multisell/4039.xml @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java index 45780446af..c4cec24dce 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/CastleChamberlain/CastleChamberlain.java @@ -76,16 +76,16 @@ public final class CastleChamberlain extends AbstractNpcAI 35184, 36655, // Giran 35226, 36656, // Oren 35274, 36657, // Aden - 35316, 36658, // Innadril - 35363, 36659, // Goddard - 35509, 36660, // Rune - 35555, 36661, // Schuttgart + // 35316, 36658, // Innadril + // 35363, 36659, // Goddard + // 35509, 36660, // Rune + // 35555, 36661, // Schuttgart }; //@formatter:on // Item private static final int CROWN = 6841; - private static final int LORD_CLOAK_OF_LIGHT = 34996; - private static final int LORD_CLOAK_OF_DARK = 34997; + private static final int LORD_CLOAK_OF_LIGHT = 34925; + private static final int LORD_CLOAK_OF_DARK = 34926; // Fortress private static final Map> FORTRESS = new HashMap<>(); @@ -372,20 +372,20 @@ public final class CastleChamberlain extends AbstractNpcAI return price; } - private final boolean isDomainFortressInContractStatus(int castleId) - { - final int numFort = ((castleId == 1) || (castleId == 5)) ? 2 : 1; - final List fortList = FORTRESS.get(castleId); - for (int i = 0; i < numFort; i++) - { - final Fort fortress = FortManager.getInstance().getFortById(fortList.get(i)); - if (fortress.getFortState() == 2) - { - return true; - } - } - return false; - } + // private final boolean isDomainFortressInContractStatus(int castleId) + // { + // final int numFort = ((castleId == 1) || (castleId == 5)) ? 2 : 1; + // final List fortList = FORTRESS.get(castleId); + // for (int i = 0; i < numFort; i++) + // { + // final Fort fortress = FortManager.getInstance().getFortById(fortList.get(i)); + // if (fortress.getFortState() == 2) + // { + // return true; + // } + // } + // return false; + // } private final boolean isOwner(L2PcInstance player, L2Npc npc) { @@ -463,10 +463,10 @@ public final class CastleChamberlain extends AbstractNpcAI { htmltext = "chamberlain-08.html"; } - else if (!isDomainFortressInContractStatus(castle.getResidenceId())) - { - htmltext = "chamberlain-27.html"; - } + // else if (!isDomainFortressInContractStatus(castle.getResidenceId())) + // { + // htmltext = "chamberlain-27.html"; + // } else { htmltext = "chamberlain-12.html"; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/CastleChamberlain/chamberlain-01.html b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/CastleChamberlain/chamberlain-01.html index 7180f7f347..0a4b185455 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/CastleChamberlain/chamberlain-01.html +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/CastleChamberlain/chamberlain-01.html @@ -8,6 +8,7 @@ Greetings, my lord. How may I serve you today?
+ \ No newline at end of file diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/CastleChamberlain/chamberlain-02.html b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/CastleChamberlain/chamberlain-02.html index a048e9b198..14d80840ae 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/CastleChamberlain/chamberlain-02.html +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/CastleChamberlain/chamberlain-02.html @@ -2,7 +2,7 @@ Greetings, Lord %clanleadername%.
Currently, the %castlename% territory is at peace, under the leadership of the %clanname% clan. This is entirely due to your wisdom and strength, Lord %clanleadername%.
- +
\ No newline at end of file diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter-05.html b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter-05.html index 2db6ea2d87..708e149490 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter-05.html +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter-05.html @@ -1,6 +1,6 @@ That is not possible as the Guardian Towers of Life have been destroyed.
-Therefore, all of those in the room will be teleported to a position near the castle hall in 8 minutes.
+Therefore, all of those in the room will be teleported to a position near the castle hall in 3 minutes.
Make yourself comfortable.
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java index 00f6f17b30..84e59514ad 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/ai/others/CastleTeleporter/CastleTeleporter.java @@ -90,7 +90,7 @@ public final class CastleTeleporter extends AbstractNpcAI if (npc.isScriptValue(0)) { final Siege siege = npc.getCastle().getSiege(); - final int time = (siege.isInProgress() && (siege.getControlTowerCount() == 0)) ? 480000 : 30000; + final int time = (siege.isInProgress() && (siege.getControlTowerCount() == 0)) ? 180000 : 30000; startQuestTimer("MASS_TELEPORT", time, npc, null); npc.setScriptValue(1); }