From 61d4311595ffcdb4e07077b973622558f6723d76 Mon Sep 17 00:00:00 2001 From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com> Date: Sat, 2 May 2015 17:48:35 +0000 Subject: [PATCH] [Classic] Removed Character Birthday Event. Used another approach to disable Olympiad announcements. Switched Milian with Roxxy on both datapacks. --- .../html/teleporter/30006-1.htm | 0 .../dist/game/data/html/teleporter/30006.htm | 5 +- .../teleporters/Milia.xml | 0 .../game/data_classic/html/default/32600.htm | 7 - .../data_classic/html/teleporter/30006.htm | 9 +- .../data_classic/html/teleporter/30059.htm | 1 - .../data_classic/html/teleporter/30080.htm | 4 +- .../data_classic/html/teleporter/30134.htm | 1 - .../data_classic/html/teleporter/30146.htm | 1 - .../data_classic/html/teleporter/30177.htm | 4 +- .../data_classic/html/teleporter/30233.htm | 4 +- .../data_classic/html/teleporter/30256.htm | 4 +- .../data_classic/html/teleporter/30320.htm | 4 +- .../data_classic/html/teleporter/30540.htm | 1 - .../data_classic/html/teleporter/30576.htm | 1 - .../data_classic/html/teleporter/30836.htm | 4 +- .../data_classic/html/teleporter/30848.htm | 3 +- .../data_classic/html/teleporter/30878.htm | 1 - .../data_classic/html/teleporter/30899.htm | 4 +- .../data_classic/html/teleporter/31275.htm | 4 +- .../data_classic/html/teleporter/31320.htm | 4 +- .../data_classic/html/teleporter/31964.htm | 4 +- .../data_classic/html/teleporter/32163.htm | 1 - .../data_classic/html/teleporter/33948.htm | 4 +- trunk/dist/game/data_classic/scripts.cfg | 3 - .../events/CharacterBirthday/32600-no.htm | 4 - .../events/CharacterBirthday/32600-nohat.htm | 4 - .../events/CharacterBirthday/32600-yes.htm | 6 - .../CharacterBirthday/CharacterBirthday.java | 124 ------------------ .../scripts/events/CharacterBirthday/busy.htm | 3 - .../events/CharacterBirthday/tooclose.htm | 4 - .../teleporters/Roxxy.xml | 0 .../gameserver/model/olympiad/Olympiad.java | 4 +- 33 files changed, 20 insertions(+), 207 deletions(-) rename trunk/dist/game/{data_classic => data}/html/teleporter/30006-1.htm (100%) rename trunk/dist/game/{data_classic => data}/teleporters/Milia.xml (100%) delete mode 100644 trunk/dist/game/data_classic/html/default/32600.htm delete mode 100644 trunk/dist/game/data_classic/scripts/events/CharacterBirthday/32600-no.htm delete mode 100644 trunk/dist/game/data_classic/scripts/events/CharacterBirthday/32600-nohat.htm delete mode 100644 trunk/dist/game/data_classic/scripts/events/CharacterBirthday/32600-yes.htm delete mode 100644 trunk/dist/game/data_classic/scripts/events/CharacterBirthday/CharacterBirthday.java delete mode 100644 trunk/dist/game/data_classic/scripts/events/CharacterBirthday/busy.htm delete mode 100644 trunk/dist/game/data_classic/scripts/events/CharacterBirthday/tooclose.htm rename trunk/dist/game/{data => data_classic}/teleporters/Roxxy.xml (100%) diff --git a/trunk/dist/game/data_classic/html/teleporter/30006-1.htm b/trunk/dist/game/data/html/teleporter/30006-1.htm similarity index 100% rename from trunk/dist/game/data_classic/html/teleporter/30006-1.htm rename to trunk/dist/game/data/html/teleporter/30006-1.htm diff --git a/trunk/dist/game/data/html/teleporter/30006.htm b/trunk/dist/game/data/html/teleporter/30006.htm index 8f3839fb2c..46b60a2c29 100644 --- a/trunk/dist/game/data/html/teleporter/30006.htm +++ b/trunk/dist/game/data/html/teleporter/30006.htm @@ -1,7 +1,8 @@ -Gatekeeper Roxxy:
-Welcome! I mean, it's weird saying welcome when I'm new here, but um, welcome anyway! I'm Roxxy from the Ivory Tower, sent away from Oren for the first time!
+Gatekeeper Milia:
+Welcome! I mean, it's weird saying welcome when I'm new here, but um, welcome anyway! I'm Milia from the Ivory Tower, sent away from Oren for the first time!
(If your main class is Lv. 76 or below, you can teleport for free.)
+ diff --git a/trunk/dist/game/data_classic/teleporters/Milia.xml b/trunk/dist/game/data/teleporters/Milia.xml similarity index 100% rename from trunk/dist/game/data_classic/teleporters/Milia.xml rename to trunk/dist/game/data/teleporters/Milia.xml diff --git a/trunk/dist/game/data_classic/html/default/32600.htm b/trunk/dist/game/data_classic/html/default/32600.htm deleted file mode 100644 index d480434a01..0000000000 --- a/trunk/dist/game/data_classic/html/default/32600.htm +++ /dev/null @@ -1,7 +0,0 @@ -Alegria:
-Phew! It's so chaotic here! Oh Hello! Hello!
-I am Alegria, here to celebrate your birthday! Heeheehee!
-Did you get my present? I hurried and flew here just in case you wanted to exchange your Birthday Hat for the Explorer Hat (event) you'd received before. I will exchange the Explorer Hat (event) with the Birthday Hat for you, if you like, and there's no charge!
- - - \ No newline at end of file diff --git a/trunk/dist/game/data_classic/html/teleporter/30006.htm b/trunk/dist/game/data_classic/html/teleporter/30006.htm index f0db630dba..871213f6fb 100644 --- a/trunk/dist/game/data_classic/html/teleporter/30006.htm +++ b/trunk/dist/game/data_classic/html/teleporter/30006.htm @@ -1,10 +1,7 @@ -Gatekeeper Milia:
-Welcome! I mean, it's weird saying welcome when I'm new here, but um, welcome anyway! I'm Milia from the Ivory Tower, sent away from Oren for the first time!
+Gatekeeper Roxxy:
+Welcome! I mean, it's weird saying welcome when I'm new here, but um, welcome anyway! I'm Roxxy from the Ivory Tower, sent away from Oren for the first time!
(If your main class is Lv. 40 or below, you can teleport for free.)
- - - - + \ No newline at end of file diff --git a/trunk/dist/game/data_classic/html/teleporter/30059.htm b/trunk/dist/game/data_classic/html/teleporter/30059.htm index 9677ad4595..94e4d1e9fc 100644 --- a/trunk/dist/game/data_classic/html/teleporter/30059.htm +++ b/trunk/dist/game/data_classic/html/teleporter/30059.htm @@ -5,6 +5,5 @@ Taking a walk and taking in the sights is always good for you, but sometimes you - \ No newline at end of file diff --git a/trunk/dist/game/data_classic/html/teleporter/30080.htm b/trunk/dist/game/data_classic/html/teleporter/30080.htm index 7913799fcf..0aa4f74cb9 100644 --- a/trunk/dist/game/data_classic/html/teleporter/30080.htm +++ b/trunk/dist/game/data_classic/html/teleporter/30080.htm @@ -4,7 +4,5 @@ We are gatekeepers of dimensional travel, capable of teleportation to destinatio - - - + \ No newline at end of file diff --git a/trunk/dist/game/data_classic/html/teleporter/30134.htm b/trunk/dist/game/data_classic/html/teleporter/30134.htm index 198af18428..1bb6cb7564 100644 --- a/trunk/dist/game/data_classic/html/teleporter/30134.htm +++ b/trunk/dist/game/data_classic/html/teleporter/30134.htm @@ -4,6 +4,5 @@ The Dark Elf Village is currently under quarantine due to an epidemic. Survivors - \ No newline at end of file diff --git a/trunk/dist/game/data_classic/html/teleporter/30146.htm b/trunk/dist/game/data_classic/html/teleporter/30146.htm index a8059e08c8..f5ce9d79cc 100644 --- a/trunk/dist/game/data_classic/html/teleporter/30146.htm +++ b/trunk/dist/game/data_classic/html/teleporter/30146.htm @@ -3,6 +3,5 @@ The Elves once thought that this forest was the entire world, but it is actually - \ No newline at end of file diff --git a/trunk/dist/game/data_classic/html/teleporter/30177.htm b/trunk/dist/game/data_classic/html/teleporter/30177.htm index eaa3699ff0..84ba10b5e2 100644 --- a/trunk/dist/game/data_classic/html/teleporter/30177.htm +++ b/trunk/dist/game/data_classic/html/teleporter/30177.htm @@ -5,7 +5,5 @@ So which one do you think describes a gatekeeper? Guess wisely -- I'm here to he - - - + \ No newline at end of file diff --git a/trunk/dist/game/data_classic/html/teleporter/30233.htm b/trunk/dist/game/data_classic/html/teleporter/30233.htm index 97616b9a1e..277ca3b97c 100644 --- a/trunk/dist/game/data_classic/html/teleporter/30233.htm +++ b/trunk/dist/game/data_classic/html/teleporter/30233.htm @@ -6,7 +6,5 @@ That said, do you need to get somewhere?
- - - + \ No newline at end of file diff --git a/trunk/dist/game/data_classic/html/teleporter/30256.htm b/trunk/dist/game/data_classic/html/teleporter/30256.htm index 2611edc8ee..5dd629df4f 100644 --- a/trunk/dist/game/data_classic/html/teleporter/30256.htm +++ b/trunk/dist/game/data_classic/html/teleporter/30256.htm @@ -6,7 +6,5 @@ Welcome! Beautiful weather, isn't it? Perfect for traveling!
- - - + \ No newline at end of file diff --git a/trunk/dist/game/data_classic/html/teleporter/30320.htm b/trunk/dist/game/data_classic/html/teleporter/30320.htm index 3554b889ee..0018471077 100644 --- a/trunk/dist/game/data_classic/html/teleporter/30320.htm +++ b/trunk/dist/game/data_classic/html/teleporter/30320.htm @@ -4,7 +4,5 @@ Lovely day, isn't it? Would you like to go somewhere? What fortune, to be able t - - - + \ No newline at end of file diff --git a/trunk/dist/game/data_classic/html/teleporter/30540.htm b/trunk/dist/game/data_classic/html/teleporter/30540.htm index 4df201199f..a72a1e2d08 100644 --- a/trunk/dist/game/data_classic/html/teleporter/30540.htm +++ b/trunk/dist/game/data_classic/html/teleporter/30540.htm @@ -5,6 +5,5 @@ The Dwarven Village is deserted due to the recent plague outbreak. The survivors - \ No newline at end of file diff --git a/trunk/dist/game/data_classic/html/teleporter/30576.htm b/trunk/dist/game/data_classic/html/teleporter/30576.htm index a46e0b1cd5..30d03b11f6 100644 --- a/trunk/dist/game/data_classic/html/teleporter/30576.htm +++ b/trunk/dist/game/data_classic/html/teleporter/30576.htm @@ -5,6 +5,5 @@ The Orc Village is deserted due to the recent plague outbreak. The survivors hav - \ No newline at end of file diff --git a/trunk/dist/game/data_classic/html/teleporter/30836.htm b/trunk/dist/game/data_classic/html/teleporter/30836.htm index 9c7b361bf9..0fa9e9a0b1 100644 --- a/trunk/dist/game/data_classic/html/teleporter/30836.htm +++ b/trunk/dist/game/data_classic/html/teleporter/30836.htm @@ -4,7 +4,5 @@ Does this bother you? I can help you get away, if you want, far, far away from h (If your main class is Lv. 40 or below, you can teleport for free.)
- - - + \ No newline at end of file diff --git a/trunk/dist/game/data_classic/html/teleporter/30848.htm b/trunk/dist/game/data_classic/html/teleporter/30848.htm index cf4eadf60c..f61ddec30c 100644 --- a/trunk/dist/game/data_classic/html/teleporter/30848.htm +++ b/trunk/dist/game/data_classic/html/teleporter/30848.htm @@ -4,7 +4,6 @@ Such a bustling place! I'm new here, and still haven't had the time to check out - - + \ No newline at end of file diff --git a/trunk/dist/game/data_classic/html/teleporter/30878.htm b/trunk/dist/game/data_classic/html/teleporter/30878.htm index d5c8a953b9..80371d6264 100644 --- a/trunk/dist/game/data_classic/html/teleporter/30878.htm +++ b/trunk/dist/game/data_classic/html/teleporter/30878.htm @@ -4,6 +4,5 @@ Now, where should I send you? You're not going to ask me to send you to Island o - \ No newline at end of file diff --git a/trunk/dist/game/data_classic/html/teleporter/30899.htm b/trunk/dist/game/data_classic/html/teleporter/30899.htm index 814fdae9c4..135183338c 100644 --- a/trunk/dist/game/data_classic/html/teleporter/30899.htm +++ b/trunk/dist/game/data_classic/html/teleporter/30899.htm @@ -6,7 +6,5 @@ Have you heard the whisper of the reeds in the wind? If not you're missing out.< - - - + \ No newline at end of file diff --git a/trunk/dist/game/data_classic/html/teleporter/31275.htm b/trunk/dist/game/data_classic/html/teleporter/31275.htm index a9057c6ce7..180567ae8a 100644 --- a/trunk/dist/game/data_classic/html/teleporter/31275.htm +++ b/trunk/dist/game/data_classic/html/teleporter/31275.htm @@ -5,7 +5,5 @@ So, what do you need?
- - - + \ No newline at end of file diff --git a/trunk/dist/game/data_classic/html/teleporter/31320.htm b/trunk/dist/game/data_classic/html/teleporter/31320.htm index 2bc94058ea..17da7a13ea 100644 --- a/trunk/dist/game/data_classic/html/teleporter/31320.htm +++ b/trunk/dist/game/data_classic/html/teleporter/31320.htm @@ -5,7 +5,5 @@ So, what can I help you with?"
- - - + \ No newline at end of file diff --git a/trunk/dist/game/data_classic/html/teleporter/31964.htm b/trunk/dist/game/data_classic/html/teleporter/31964.htm index bfa35772a9..2403e4bd76 100644 --- a/trunk/dist/game/data_classic/html/teleporter/31964.htm +++ b/trunk/dist/game/data_classic/html/teleporter/31964.htm @@ -5,7 +5,5 @@ If you've decided on your destination, I'll teleport you.
- - - + \ No newline at end of file diff --git a/trunk/dist/game/data_classic/html/teleporter/32163.htm b/trunk/dist/game/data_classic/html/teleporter/32163.htm index 479527cfa0..778689d44d 100644 --- a/trunk/dist/game/data_classic/html/teleporter/32163.htm +++ b/trunk/dist/game/data_classic/html/teleporter/32163.htm @@ -4,6 +4,5 @@ Teleportation magic was not permitted in Kamael lands from the very beginning of - \ No newline at end of file diff --git a/trunk/dist/game/data_classic/html/teleporter/33948.htm b/trunk/dist/game/data_classic/html/teleporter/33948.htm index 66c1a9aa4e..e6d0aedea1 100644 --- a/trunk/dist/game/data_classic/html/teleporter/33948.htm +++ b/trunk/dist/game/data_classic/html/teleporter/33948.htm @@ -4,7 +4,5 @@ Now, what can I help you with?
(You can teleport for free if your main class is Lv. 40 or below.)
- - - + \ No newline at end of file diff --git a/trunk/dist/game/data_classic/scripts.cfg b/trunk/dist/game/data_classic/scripts.cfg index 89417ca759..82c27b7c4e 100644 --- a/trunk/dist/game/data_classic/scripts.cfg +++ b/trunk/dist/game/data_classic/scripts.cfg @@ -103,6 +103,3 @@ vehicles/BoatGiranTalking.java vehicles/BoatInnadrilTour.java vehicles/BoatGludinRune.java vehicles/BoatTalkingGludin.java - -# Events -events/CharacterBirthday/CharacterBirthday.java diff --git a/trunk/dist/game/data_classic/scripts/events/CharacterBirthday/32600-no.htm b/trunk/dist/game/data_classic/scripts/events/CharacterBirthday/32600-no.htm deleted file mode 100644 index b3b10ca6eb..0000000000 --- a/trunk/dist/game/data_classic/scripts/events/CharacterBirthday/32600-no.htm +++ /dev/null @@ -1,4 +0,0 @@ -Alegria:
-Oh really?!
-Well, I'm already taken. But I'm flattered that you would think so highly of me. - \ No newline at end of file diff --git a/trunk/dist/game/data_classic/scripts/events/CharacterBirthday/32600-nohat.htm b/trunk/dist/game/data_classic/scripts/events/CharacterBirthday/32600-nohat.htm deleted file mode 100644 index 6ee1ab73dd..0000000000 --- a/trunk/dist/game/data_classic/scripts/events/CharacterBirthday/32600-nohat.htm +++ /dev/null @@ -1,4 +0,0 @@ -Alegria:
-Oh, no! You don't have the hat with you.
-You should've checked to see if the Explorer Hat (event) was in your inventory! Can't exchange if you don't have it! - \ No newline at end of file diff --git a/trunk/dist/game/data_classic/scripts/events/CharacterBirthday/32600-yes.htm b/trunk/dist/game/data_classic/scripts/events/CharacterBirthday/32600-yes.htm deleted file mode 100644 index 4a3df2934e..0000000000 --- a/trunk/dist/game/data_classic/scripts/events/CharacterBirthday/32600-yes.htm +++ /dev/null @@ -1,6 +0,0 @@ -Alegria:
-Once you exchange your Explorer Hat, you will not be able to receive it again. Are you ok with that?
-Your Birthday Hat is so pretty, which is why I'm worried that this might be a mistake on your part.
- - - \ No newline at end of file diff --git a/trunk/dist/game/data_classic/scripts/events/CharacterBirthday/CharacterBirthday.java b/trunk/dist/game/data_classic/scripts/events/CharacterBirthday/CharacterBirthday.java deleted file mode 100644 index e3e428c95d..0000000000 --- a/trunk/dist/game/data_classic/scripts/events/CharacterBirthday/CharacterBirthday.java +++ /dev/null @@ -1,124 +0,0 @@ -/* - * Copyright (C) 2004-2015 L2J DataPack - * - * This file is part of L2J DataPack. - * - * L2J DataPack is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * L2J DataPack is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package events.CharacterBirthday; - -import com.l2jserver.gameserver.model.actor.L2Npc; -import com.l2jserver.gameserver.model.actor.instance.L2PcInstance; -import com.l2jserver.gameserver.model.quest.Quest; -import com.l2jserver.gameserver.util.Util; - -/** - * Character Birthday event AI.
- * Updated to H5 by Nyaran. - * @author Gnacik - */ -public final class CharacterBirthday extends Quest -{ - private static final int ALEGRIA = 32600; - private static int SPAWNS = 0; - - private final static int[] GK = - { - 30006, - 30059, - 30080, - 30134, - 30146, - 30177, - 30233, - 30256, - 30320, - 30540, - 30576, - 30836, - 30848, - 30878, - 30899, - 31275, - 31320, - 31964, - 32163 - }; - - private CharacterBirthday() - { - super(-1, CharacterBirthday.class.getSimpleName(), "events"); - addStartNpc(ALEGRIA); - addStartNpc(GK); - addTalkId(ALEGRIA); - addTalkId(GK); - } - - @Override - public String onAdvEvent(String event, L2Npc npc, L2PcInstance player) - { - String htmltext = event; - if (event.equalsIgnoreCase("despawn_npc")) - { - npc.doDie(player); - SPAWNS--; - - htmltext = null; - } - else if (event.equalsIgnoreCase("change")) - { - // Change Hat - if (hasQuestItems(player, 10250)) - { - takeItems(player, 10250, 1); // Adventurer Hat (Event) - giveItems(player, 21594, 1); // Birthday Hat - htmltext = null; // FIXME: Probably has html - // Despawn npc - npc.doDie(player); - SPAWNS--; - } - else - { - htmltext = "32600-nohat.htm"; - } - } - return htmltext; - } - - @Override - public String onTalk(L2Npc npc, L2PcInstance player) - { - if (SPAWNS >= 3) - { - return "busy.htm"; - } - - if (!Util.checkIfInRange(10, npc, player, true)) - { - L2Npc spawned = addSpawn(32600, player.getX() + 10, player.getY() + 10, player.getZ() + 10, 0, false, 0, true); - startQuestTimer("despawn_npc", 180000, spawned, player); - SPAWNS++; - } - else - { - return "tooclose.htm"; - } - return null; - } - - public static void main(String[] args) - { - new CharacterBirthday(); - } -} diff --git a/trunk/dist/game/data_classic/scripts/events/CharacterBirthday/busy.htm b/trunk/dist/game/data_classic/scripts/events/CharacterBirthday/busy.htm deleted file mode 100644 index 51ed4e2d45..0000000000 --- a/trunk/dist/game/data_classic/scripts/events/CharacterBirthday/busy.htm +++ /dev/null @@ -1,3 +0,0 @@ - -Alegria is very busy now. Try again later. - \ No newline at end of file diff --git a/trunk/dist/game/data_classic/scripts/events/CharacterBirthday/tooclose.htm b/trunk/dist/game/data_classic/scripts/events/CharacterBirthday/tooclose.htm deleted file mode 100644 index d0dbdfeb60..0000000000 --- a/trunk/dist/game/data_classic/scripts/events/CharacterBirthday/tooclose.htm +++ /dev/null @@ -1,4 +0,0 @@ -Gatekeeper:
-Alegria, the Creation Day Helper, cannot be summoned as you are too close. -Please move back a little bit and try again. - \ No newline at end of file diff --git a/trunk/dist/game/data/teleporters/Roxxy.xml b/trunk/dist/game/data_classic/teleporters/Roxxy.xml similarity index 100% rename from trunk/dist/game/data/teleporters/Roxxy.xml rename to trunk/dist/game/data_classic/teleporters/Roxxy.xml diff --git a/trunk/java/com/l2jserver/gameserver/model/olympiad/Olympiad.java b/trunk/java/com/l2jserver/gameserver/model/olympiad/Olympiad.java index 0cd4ce8372..e3303e1770 100644 --- a/trunk/java/com/l2jserver/gameserver/model/olympiad/Olympiad.java +++ b/trunk/java/com/l2jserver/gameserver/model/olympiad/Olympiad.java @@ -479,7 +479,7 @@ public class Olympiad extends ListenersContainer _scheduledCompStart = ThreadPoolManager.getInstance().scheduleGeneral(() -> { - if (isOlympiadEnd()) + if (isOlympiadEnd() || Config.SERVER_CLASSIC_SUPPORT) { return; } @@ -491,7 +491,7 @@ public class Olympiad extends ListenersContainer _logResults.info("Result,Player1,Player2,Player1 HP,Player2 HP,Player1 Damage,Player2 Damage,Points,Classed"); _gameManager = ThreadPoolManager.getInstance().scheduleGeneralAtFixedRate(OlympiadGameManager.getInstance(), 30000, 30000); - if (Config.ALT_OLY_ANNOUNCE_GAMES && !Config.SERVER_CLASSIC_SUPPORT) + if (Config.ALT_OLY_ANNOUNCE_GAMES) { _gameAnnouncer = ThreadPoolManager.getInstance().scheduleGeneralAtFixedRate(new OlympiadAnnouncer(), 30000, 500); }