From c896c6cd5121c02c451eb86b8b4c10988eb528b7 Mon Sep 17 00:00:00 2001
From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Mon, 20 Apr 2015 19:23:15 +0000
Subject: [PATCH] Cruma Tower Teleporter changes. Contributed by Stayway.
---
.../dist/game/data/html/teleporter/30484.htm | 8 ++--
.../dist/game/data/html/teleporter/30485.htm | 8 ++--
.../dist/game/data/html/teleporter/30487.htm | 7 ++--
.../ai/npc/Teleports/CrumaTower/30483-1.html | 2 +-
.../ai/npc/Teleports/CrumaTower/30483.html | 10 +++--
.../npc/Teleports/CrumaTower/CrumaTower.java | 37 +++++++++++++------
6 files changed, 45 insertions(+), 27 deletions(-)
diff --git a/trunk/dist/game/data/html/teleporter/30484.htm b/trunk/dist/game/data/html/teleporter/30484.htm
index cfd85c8e27..239bc21672 100644
--- a/trunk/dist/game/data/html/teleporter/30484.htm
+++ b/trunk/dist/game/data/html/teleporter/30484.htm
@@ -1,6 +1,6 @@
-Gatekeeper Ponti:
-If you choose to return to the surface, no one will say you are a coward. If you want to go back to the surface, I will send you back through the gate.
-I will be here waiting whenever you need my powers.
-
+Ivory Tower Wizard Janssen:
+Hehe... You look so scared! Don't worry, there aren't any thieves or bandits here... the monsters have chased them all off, haha!.
+Just kidding. Well, not about the monsters. Oh! You want to get out of here? Can't say I blame you.
+
\ No newline at end of file
diff --git a/trunk/dist/game/data/html/teleporter/30485.htm b/trunk/dist/game/data/html/teleporter/30485.htm
index 46ed9e84d7..2451fd7b9e 100644
--- a/trunk/dist/game/data/html/teleporter/30485.htm
+++ b/trunk/dist/game/data/html/teleporter/30485.htm
@@ -1,5 +1,7 @@
-Gatekeeper Capella:
-Greetings. I admire you for surviving this far. If you continue on, you must be even more careful because there are monsters out there that are more terrible than what you could imagine. If you are not sure that you are ready, go prepare yourself thoroughly and then return.
-
+Ivory Tower Wizard Belkadhi:
+In the past, the Ivory Tower dispatched many female wizards here. I think that many people here failed to take them seriously, and... well, let's just say that relationship degenerated. Some of the ancient ruins were destroyed in the ensuing battles, and now only male wizards are allowed to be sent here.
+I can tell you, things are unstable here right now. If you want to proceed, you'd be well advised to make your preparations first.
+
+
\ No newline at end of file
diff --git a/trunk/dist/game/data/html/teleporter/30487.htm b/trunk/dist/game/data/html/teleporter/30487.htm
index 51caaa41a3..85d38fdb9f 100644
--- a/trunk/dist/game/data/html/teleporter/30487.htm
+++ b/trunk/dist/game/data/html/teleporter/30487.htm
@@ -1,5 +1,6 @@
-Gatekeeper Penelope:
-Hey, there! Are you one of those who seeks the secrets of the giants of ere? Well wise up and get out of here! If you think you must get to the second floor of this tower -- which is teeming with monsters -- I can send you through the gate, but surely you have something better to do than risk your life in a horrible place like this...
-
+Ivory Tower Wizard Rombel:
+Cough, cough. Ugh, this place taking its toll on me, mentally and physically. Why did I ever let them send me here? If you know what's good for you, you'll turn right around and go back to the village. Cough... cough...
+Let me tell you this one more time. The 3rd basement floor is the safest here. As you go up, it will get more dangerous.
+
\ No newline at end of file
diff --git a/trunk/dist/game/data/scripts/ai/npc/Teleports/CrumaTower/30483-1.html b/trunk/dist/game/data/scripts/ai/npc/Teleports/CrumaTower/30483-1.html
index f9c1c64f84..f5af2e76df 100644
--- a/trunk/dist/game/data/scripts/ai/npc/Teleports/CrumaTower/30483-1.html
+++ b/trunk/dist/game/data/scripts/ai/npc/Teleports/CrumaTower/30483-1.html
@@ -1,4 +1,4 @@
-Gatekeeper Mozella:
+Gatekeeper Carsus:
Ah! You are too strong for the Gate of Time and Space to open. You seem to have exceeded the limits of the tower's magnetic field.
(Characters who are level 56 and above cannot enter the Cruma Tower.)
\ No newline at end of file
diff --git a/trunk/dist/game/data/scripts/ai/npc/Teleports/CrumaTower/30483.html b/trunk/dist/game/data/scripts/ai/npc/Teleports/CrumaTower/30483.html
index 66e7e1f290..b6b0864c26 100644
--- a/trunk/dist/game/data/scripts/ai/npc/Teleports/CrumaTower/30483.html
+++ b/trunk/dist/game/data/scripts/ai/npc/Teleports/CrumaTower/30483.html
@@ -1,6 +1,8 @@
-Gatekeeper Mozella:
-My name is Mozella. I am one of the researchers dispatched from Oren's Ivory Tower to search for the secrets lost in the Tower of the Giants. We recently discovered what we think is a device used by the Giants in a bygone age to travel through space and time, and we are trying to unlock its secrets. Fortunately, this place was untouched by the outside world during the long years, so the mysteries of the Giants have remained undisturbed until our arrival. Unfortunately, however, the Tower is also inhabited by a number of frightful monsters.
-If you wish to brave the dangers to explore these mysterious ruins, however, I will open the door of space and time and admit you to the Tower's interior.
-
+Ivory Tower Wizard Carsus:
+My name is Carsus, and I am an investigator dispatched from Ivory Tower. We've finished our work at the upper layer of the tower, and are ready to move onto the lower layer.
+We're installing an elevator to the 3rd basement floor. Up to this point, we've used magic, but it's an unpredictable system at best, so an elevator seemed much safer.
+On the 1st basement floor, you will see a raid boss that controls the entire Cruma Tower. You can go there trough Ivory Tower Wizard Ian who you can find in a remote area of the 2nd basement floor.
+
+
\ No newline at end of file
diff --git a/trunk/dist/game/data/scripts/ai/npc/Teleports/CrumaTower/CrumaTower.java b/trunk/dist/game/data/scripts/ai/npc/Teleports/CrumaTower/CrumaTower.java
index 9d30f2b555..7410472d82 100644
--- a/trunk/dist/game/data/scripts/ai/npc/Teleports/CrumaTower/CrumaTower.java
+++ b/trunk/dist/game/data/scripts/ai/npc/Teleports/CrumaTower/CrumaTower.java
@@ -26,35 +26,48 @@ import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
/**
* Cruma Tower teleport AI.
- * @author Plim
+ * @author Stayway
*/
public final class CrumaTower extends AbstractNpcAI
{
// NPC
- private static final int MOZELLA = 30483;
+ private static final int CARSUS = 30483;
// Locations
- private static final Location TELEPORT_LOC1 = new Location(17776, 113968, -11671);
- private static final Location TELEPORT_LOC2 = new Location(17680, 113968, -11671);
+ private static final Location TELEPORT_LOC1 = new Location(17664, 108288, -9056);
+ private static final Location TELEPORT_LOC2 = new Location(17729, 114808, -11696);
// Misc
private static final int MAX_LEVEL = 55;
private CrumaTower()
{
super(CrumaTower.class.getSimpleName(), "ai/npc/Teleports");
- addFirstTalkId(MOZELLA);
- addStartNpc(MOZELLA);
- addTalkId(MOZELLA);
+ addFirstTalkId(CARSUS);
+ addStartNpc(CARSUS);
+ addTalkId(CARSUS);
}
@Override
- public String onTalk(L2Npc npc, L2PcInstance talker)
+ public final String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
{
- if (talker.getLevel() <= MAX_LEVEL)
+ if (event.equals("chat1"))
{
- talker.teleToLocation(getRandomBoolean() ? TELEPORT_LOC1 : TELEPORT_LOC2);
- return null;
+ if (player.getLevel() <= MAX_LEVEL)
+ {
+ player.teleToLocation(TELEPORT_LOC1, true);
+ return null;
+ }
+ return "30483-1.html";
}
- return "30483-1.html";
+ else if (event.equals("chat2"))
+ {
+ if (player.getLevel() <= MAX_LEVEL)
+ {
+ player.teleToLocation(TELEPORT_LOC2, true);
+ return null;
+ }
+ return "30483-1.html";
+ }
+ return event;
}
public static void main(String[] args)