From 790cb41f6f087a45b00379a38804ba1ad99637ac Mon Sep 17 00:00:00 2001
From: xban1x <urban.lavbic@gmail.com>
Date: Tue, 27 Aug 2013 11:54:49 +0000
Subject: [PATCH] BETA: Removing Miss Queen it is last used in Gracia Final.
* Minor typo fix for Teleport Device. * Reported by: CostyKiller
* Patch by: CostyKiller * Reviewed by: Konstantinos,
xban1x
---
.../dist/game/data/html/default/32752.htm | 7 +-
.../data/scripts/custom/MissQueen/31760-1.htm | 4 -
.../data/scripts/custom/MissQueen/31760-2.htm | 4 -
.../data/scripts/custom/MissQueen/31760-3.htm | 3 -
.../data/scripts/custom/MissQueen/31760-4.htm | 4 -
.../data/scripts/custom/MissQueen/31760-5.htm | 5 -
.../data/scripts/custom/MissQueen/31760-6.htm | 4 -
.../data/scripts/custom/MissQueen/31760.htm | 11 --
.../scripts/custom/MissQueen/MissQueen.java | 148 ------------------
9 files changed, 3 insertions(+), 187 deletions(-)
delete mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/custom/MissQueen/31760-1.htm
delete mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/custom/MissQueen/31760-2.htm
delete mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/custom/MissQueen/31760-3.htm
delete mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/custom/MissQueen/31760-4.htm
delete mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/custom/MissQueen/31760-5.htm
delete mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/custom/MissQueen/31760-6.htm
delete mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/custom/MissQueen/31760.htm
delete mode 100644 L2J_DataPack_BETA/dist/game/data/scripts/custom/MissQueen/MissQueen.java
diff --git a/L2J_DataPack_BETA/dist/game/data/html/default/32752.htm b/L2J_DataPack_BETA/dist/game/data/html/default/32752.htm
index 0fc03d5014..42c4ea6088 100644
--- a/L2J_DataPack_BETA/dist/game/data/html/default/32752.htm
+++ b/L2J_DataPack_BETA/dist/game/data/html/default/32752.htm
@@ -1,7 +1,6 @@
-<html><body>
-Teleport Device:<br>
+<html><body>Teleport Device:<br>
It's a teleporter where one can travel around space.<br>
<a action="bypass -h Quest TowerOfInfinitum up">Come out from Tower of Space.</a><br>
-<a action="bypass -h Quest TowerOfInfinitum down">Go downstaris.</a><br>
-<a action="bypass -h npc_%objectId%_Quest RankuFloor">Face Demon Prince.</a>
+<a action="bypass -h Quest TowerOfInfinitum down">Go downstairs.</a><br>
+<a action="bypass -h npc_%objectId%_Quest RankuFloor">Face Ranku.</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/custom/MissQueen/31760-1.htm b/L2J_DataPack_BETA/dist/game/data/scripts/custom/MissQueen/31760-1.htm
deleted file mode 100644
index 17d6b9bda6..0000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/custom/MissQueen/31760-1.htm
+++ /dev/null
@@ -1,4 +0,0 @@
-<html><body>Adventurers' Guide Miss Queen:<br>
-You've already received a weapon exchange coupon for training adventurers! Do you actually think you can fool Miss Queen?<br>
-(Players are only allowed one trainee weapon exchange coupon per account.)
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/custom/MissQueen/31760-2.htm b/L2J_DataPack_BETA/dist/game/data/scripts/custom/MissQueen/31760-2.htm
deleted file mode 100644
index e345a39c64..0000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/custom/MissQueen/31760-2.htm
+++ /dev/null
@@ -1,4 +0,0 @@
-<html><body>Adventurers' Guide Miss Queen:<br>
-Here's the coupon you requested. You're now eligible to rent a weapon from the Adventurer's Guild warehouse. This coupon is non-transferable, and you are responsible for any damages or loss of weaponry.<br>
-You may only rent one weapon at a time, and if at any time before you reach level 25 you become unhappy with your choice, you may turn in the weapon for another coupon. Good luck!
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/custom/MissQueen/31760-3.htm b/L2J_DataPack_BETA/dist/game/data/scripts/custom/MissQueen/31760-3.htm
deleted file mode 100644
index a0d7684bb9..0000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/custom/MissQueen/31760-3.htm
+++ /dev/null
@@ -1,3 +0,0 @@
-<html><body>Adventurers' Guide Miss Queen:<br>
-You're not qualified to receive a weapon exchange coupon for trainees! It's reserved for adventurers visiting the world of Lineage II for the first time. Unless your level is 6 or above and you are an adventurer new to the world of Lineage II, I won't give you a coupon! (<font color="LEVEL">Only new characters of level 6 or above are eligible for the coupon.)</font>
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/custom/MissQueen/31760-4.htm b/L2J_DataPack_BETA/dist/game/data/scripts/custom/MissQueen/31760-4.htm
deleted file mode 100644
index 88e9650b55..0000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/custom/MissQueen/31760-4.htm
+++ /dev/null
@@ -1,4 +0,0 @@
-<html><body>Adventurers' Guide Miss Queen:<br>
-You've already received a weapon exchange coupon for travelers! Do you really think you can fool Miss Queen?<br>
-(Players may receive only one weapon exchange coupon per account.)
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/custom/MissQueen/31760-5.htm b/L2J_DataPack_BETA/dist/game/data/scripts/custom/MissQueen/31760-5.htm
deleted file mode 100644
index b88f1dc5da..0000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/custom/MissQueen/31760-5.htm
+++ /dev/null
@@ -1,5 +0,0 @@
-<html><body>Adventurers' Guide Miss Queen:<br>
-Have you enjoyed your adventure so far? Here is the weapon exchange coupon for travelers.<br>
-This coupon allows you to receive a grade D weapon from the warehouse of the Adventurer's Guild. The coupon is non-transferable, and you are responsible for any loss or damage of it or the weapon.<br>
-You may only rent one weapon at a time, and if at any time before you reach level 25 you become unhappy with your choice, you may turn in the weapon for another coupon. Good luck!
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/custom/MissQueen/31760-6.htm b/L2J_DataPack_BETA/dist/game/data/scripts/custom/MissQueen/31760-6.htm
deleted file mode 100644
index 491992600a..0000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/custom/MissQueen/31760-6.htm
+++ /dev/null
@@ -1,4 +0,0 @@
-<html><body>Adventurers' Guide Miss Queen:<br>
-You're not qualified to receive more than one weapon exchange coupon for travelers! It's reserved for adventurers visiting the world of Lineage II for the first time who have completed their first occupation change!<br>
-(<font color="LEVEL">Only new characters who have completed their first occupation change are eligible to receive a coupon.)</font>
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/custom/MissQueen/31760.htm b/L2J_DataPack_BETA/dist/game/data/scripts/custom/MissQueen/31760.htm
deleted file mode 100644
index 76a3f467fc..0000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/custom/MissQueen/31760.htm
+++ /dev/null
@@ -1,11 +0,0 @@
-<html><body>Adventurers' Guide Miss Queen:<br>
-Welcome! I've been dispatched from the Adventurer's Guild to guide characters new to the world of Lineage II.<br>
-In celebration of the arrival of a new era, the guild has temporarily opened its weapons warehouse to adventurers in training and travelers that have reached level 6 and completed their first occupation change. If you meet these requirements, I'll give you a <font color="LEVEL">weapon exchange coupon</font> and permit you to <font color="LEVEL">rent the weapon of your choice from the Adventurer's Guild weapons warehouse</font>. Bear in mind, this coupon is only valid until you reach level 25. Are you ready to choose your weapon?<br>
-(Any character with a PK count of 1 or above is not eligible to receive the coupon.)<br>
-<a action="bypass -h Quest MissQueen newbie_give_coupon">"Please give me a weapon exchange coupon for trainees."</a><br>
-<a action="bypass -h npc_%objectId%_exc_multisell 317606002">"I want to return a weapon for trainees."</a><br>
-<a action="bypass -h npc_%objectId%_multisell 317606001">"I want to visit the weapons warehouse for trainees."</a><br>
-<a action="bypass -h Quest MissQueen traveller_give_coupon">"Please give me a weapon exchange coupon for travelers."</a><br>
-<a action="bypass -h npc_%objectId%_exc_multisell 317606004">"I want to return a weapon for travelers."</a><br>
-<a action="bypass -h npc_%objectId%_multisell 317606003">"I want to visit the weapons warehouse for travelers."</a>
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/custom/MissQueen/MissQueen.java b/L2J_DataPack_BETA/dist/game/data/scripts/custom/MissQueen/MissQueen.java
deleted file mode 100644
index f27b340390..0000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/custom/MissQueen/MissQueen.java
+++ /dev/null
@@ -1,148 +0,0 @@
-/*
- * Copyright (C) 2004-2013 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 <http://www.gnu.org/licenses/>.
- */
-package custom.MissQueen;
-
-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.model.quest.QuestState;
-
-/**
- * Miss Queen AI. Original Jython script by DrLecter, based in Eduu, biti and Newbie contributions.
- * @author Nyaran
- */
-public class MissQueen extends Quest
-{
- private static final String qn = "MissQueen";
-
- private static final int COUPNE_ONE = 7832;
- private static final int COUPNE_TWO = 7833;
-
- private static final int[] NPCs =
- {
- 31760,
- 31761,
- 31762,
- 31763,
- 31764,
- 31765,
- 31766
- };
-
- // enable/disable coupon give
- private static boolean QUEEN_ENABLED = false;
- // Newbie/one time rewards section
- // Any quest should rely on a unique bit, but
- // it could be shared among quest that were mutually
- // exclusive or race restricted.
- // Bit #1 isn't used for backwards compatibility.
- // This script uses 2 bits, one for newbie coupons and another for travelers
- private static final int NEWBIE_REWARD = 16;
- private static final int TRAVELER_REWARD = 32;
-
- public MissQueen(int id, String name, String descr)
- {
- super(id, name, descr);
-
- for (int i : NPCs)
- {
- addStartNpc(i);
- addFirstTalkId(i);
- addTalkId(i);
- }
- }
-
- @Override
- public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
- {
- String htmltext = event;
-
- if (!QUEEN_ENABLED)
- {
- return htmltext;
- }
-
- QuestState st = player.getQuestState(qn);
- int newbie = player.getNewbie();
- int level = player.getLevel();
- int occupation_level = player.getClassId().level();
- int pkkills = player.getPkKills();
- if (event.equals("newbie_give_coupon"))
- {
- /*
- * TODO: check if this is the very first character for this account would need a bit of SQL, or a core method to determine it. This condition should be stored by the core in the account_data table upon character creation.
- */
- if ((level >= 6) && (level <= 25) && (pkkills == 0) && (occupation_level == 0))
- {
- if ((newbie | NEWBIE_REWARD) != newbie)
- {
- player.setNewbie(newbie | NEWBIE_REWARD);
- st.giveItems(COUPNE_ONE, 1);
- htmltext = "31760-2.htm"; // here's the coupon you requested
- }
- else
- {
- htmltext = "31760-1.htm"; // you got a coupon already!
- }
- }
- else
- {
- htmltext = "31760-3.htm"; // you're not eligible to get a coupon (level caps, pkkills or already changed class)
- }
- }
- else if (event.equals("traveller_give_coupon"))
- {
- if ((level >= 6) && (level <= 25) && (pkkills == 0) && (occupation_level == 1))
- { // check the player state against this quest newbie rewarding mark.
- if ((newbie | TRAVELER_REWARD) != newbie)
- {
- player.setNewbie(newbie | TRAVELER_REWARD);
- st.giveItems(COUPNE_TWO, 1);
- htmltext = "31760-5.htm"; // here's the coupon you requested
- }
- else
- {
- htmltext = "31760-4.htm"; // you got a coupon already!
- }
- }
- else
- {
- htmltext = "31760-6.htm"; // you're not eligible to get a coupon (level caps, pkkills or already changed class)
- }
- }
-
- return htmltext;
- }
-
- @Override
- public String onFirstTalk(L2Npc npc, L2PcInstance player)
- {
- QuestState st = player.getQuestState(qn);
- if (st == null)
- {
- st = newQuestState(player);
- }
- return "31760.htm";
- }
-
- public static void main(String args[])
- {
- new MissQueen(-1, qn, "custom");
- }
-}
--
GitLab