From 99c139efab5e9f32c2a7bec6facc468253cf58da Mon Sep 17 00:00:00 2001
From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Wed, 16 Dec 2015 12:27:16 +0000
Subject: [PATCH] Improved starting Ertheia quests.
---
.../dist/game/data/html/teleporter/34002.htm | 5 --
.../KaraphonHabitat}/34002.html | 0
.../KaraphonHabitat/KaraphonHabitat.java | 21 +++--
.../Q10735_ASpecialPower.java | 2 +-
.../Q10736_ASpecialPower.java | 2 +
.../Q10742_AFurryFriend.java | 1 +
.../dist/game/data/stats/npcs/19500-19599.xml | 13 ++--
.../dist/game/data/stats/npcs/23400-23499.xml | 43 ++++++++---
.../dist/game/data/stats/npcs/27500-27599.xml | 76 +++++++++++++++----
.../dist/game/data/stats/npcs/34000-34099.xml | 9 +--
10 files changed, 123 insertions(+), 49 deletions(-)
delete mode 100644 trunk/dist/game/data/html/teleporter/34002.htm
rename trunk/dist/game/data/scripts/{quests/Q10745_TheSecretIngredients => instances/KaraphonHabitat}/34002.html (100%)
diff --git a/trunk/dist/game/data/html/teleporter/34002.htm b/trunk/dist/game/data/html/teleporter/34002.htm
deleted file mode 100644
index 09323cba29..0000000000
--- a/trunk/dist/game/data/html/teleporter/34002.htm
+++ /dev/null
@@ -1,5 +0,0 @@
-Maestro Dolkin:
-You're better than I thought!
-Shall we step outside?
-
-
\ No newline at end of file
diff --git a/trunk/dist/game/data/scripts/quests/Q10745_TheSecretIngredients/34002.html b/trunk/dist/game/data/scripts/instances/KaraphonHabitat/34002.html
similarity index 100%
rename from trunk/dist/game/data/scripts/quests/Q10745_TheSecretIngredients/34002.html
rename to trunk/dist/game/data/scripts/instances/KaraphonHabitat/34002.html
diff --git a/trunk/dist/game/data/scripts/instances/KaraphonHabitat/KaraphonHabitat.java b/trunk/dist/game/data/scripts/instances/KaraphonHabitat/KaraphonHabitat.java
index acf1e83943..9a0ce71968 100644
--- a/trunk/dist/game/data/scripts/instances/KaraphonHabitat/KaraphonHabitat.java
+++ b/trunk/dist/game/data/scripts/instances/KaraphonHabitat/KaraphonHabitat.java
@@ -36,11 +36,9 @@ public class KaraphonHabitat extends AbstractInstance
// Npcs
private static final int DOLKIN = 33954;
private static final int DOLKIN_INSTANCE = 34002;
-
// Locations
private static final Location START_LOC = new Location(-82250, 246406, -14152);
private static final Location EXIT_LOC = new Location(-88240, 237450, -2880);
-
// Instance
private static final int TEMPLATE_ID = 253;
@@ -48,6 +46,14 @@ public class KaraphonHabitat extends AbstractInstance
{
}
+ public KaraphonHabitat()
+ {
+ super(KaraphonHabitat.class.getSimpleName());
+ addFirstTalkId(DOLKIN_INSTANCE);
+ addStartNpc(DOLKIN, DOLKIN_INSTANCE);
+ addTalkId(DOLKIN, DOLKIN_INSTANCE);
+ }
+
@Override
public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
{
@@ -64,6 +70,10 @@ public class KaraphonHabitat extends AbstractInstance
else if (event.equals("exit_instance"))
{
final InstanceWorld world = InstanceManager.getInstance().getPlayerWorld(player);
+ if (!(world instanceof KHWorld))
+ {
+ return null;
+ }
world.removeAllowed(player.getObjectId());
teleportPlayer(player, EXIT_LOC, 0);
}
@@ -71,11 +81,10 @@ public class KaraphonHabitat extends AbstractInstance
return super.onAdvEvent(event, npc, player);
}
- public KaraphonHabitat()
+ @Override
+ public String onFirstTalk(L2Npc npc, L2PcInstance player)
{
- super(KaraphonHabitat.class.getSimpleName());
- addStartNpc(DOLKIN);
- addTalkId(DOLKIN, DOLKIN_INSTANCE);
+ return "34002.html";
}
@Override
diff --git a/trunk/dist/game/data/scripts/quests/Q10735_ASpecialPower/Q10735_ASpecialPower.java b/trunk/dist/game/data/scripts/quests/Q10735_ASpecialPower/Q10735_ASpecialPower.java
index ed077a2510..ff5d8cd7f5 100644
--- a/trunk/dist/game/data/scripts/quests/Q10735_ASpecialPower/Q10735_ASpecialPower.java
+++ b/trunk/dist/game/data/scripts/quests/Q10735_ASpecialPower/Q10735_ASpecialPower.java
@@ -116,7 +116,7 @@ public class Q10735_ASpecialPower extends Quest
@Override
public String onTalk(L2Npc npc, L2PcInstance player)
{
- QuestState qs = getQuestState(player, true);
+ final QuestState qs = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
if (qs.isCompleted())
diff --git a/trunk/dist/game/data/scripts/quests/Q10736_ASpecialPower/Q10736_ASpecialPower.java b/trunk/dist/game/data/scripts/quests/Q10736_ASpecialPower/Q10736_ASpecialPower.java
index b890b56855..6bd8ffc497 100644
--- a/trunk/dist/game/data/scripts/quests/Q10736_ASpecialPower/Q10736_ASpecialPower.java
+++ b/trunk/dist/game/data/scripts/quests/Q10736_ASpecialPower/Q10736_ASpecialPower.java
@@ -221,8 +221,10 @@ public class Q10736_ASpecialPower extends Quest
break;
}
}
+ break;
}
}
+
return htmltext;
}
diff --git a/trunk/dist/game/data/scripts/quests/Q10742_AFurryFriend/Q10742_AFurryFriend.java b/trunk/dist/game/data/scripts/quests/Q10742_AFurryFriend/Q10742_AFurryFriend.java
index 8f5d00dd2b..0f85a71966 100644
--- a/trunk/dist/game/data/scripts/quests/Q10742_AFurryFriend/Q10742_AFurryFriend.java
+++ b/trunk/dist/game/data/scripts/quests/Q10742_AFurryFriend/Q10742_AFurryFriend.java
@@ -117,6 +117,7 @@ public class Q10742_AFurryFriend extends Quest
player.sendPacket(new ExSendUIEvent(player, false, false, 0, 0, NpcStringId.REMAINING_TIME));
startQuestTimer("unspawn_ricky", 2000, npc, player);
cancelQuestTimer("check_ricky_distance", npc, player);
+ cancelQuestTimer("unspawn_ricky_failed", npc, player);
break;
}
diff --git a/trunk/dist/game/data/stats/npcs/19500-19599.xml b/trunk/dist/game/data/stats/npcs/19500-19599.xml
index b855c29a8f..bb1d844864 100644
--- a/trunk/dist/game/data/stats/npcs/19500-19599.xml
+++ b/trunk/dist/game/data/stats/npcs/19500-19599.xml
@@ -510,14 +510,17 @@
-
- HUMAN
+ ETC
FEMALE
-
+
+
+
+
+
-
-
+
+
diff --git a/trunk/dist/game/data/stats/npcs/23400-23499.xml b/trunk/dist/game/data/stats/npcs/23400-23499.xml
index 1a8974d0c7..b0e8d0acc3 100644
--- a/trunk/dist/game/data/stats/npcs/23400-23499.xml
+++ b/trunk/dist/game/data/stats/npcs/23400-23499.xml
@@ -1961,7 +1961,6 @@
-
@@ -2188,25 +2187,47 @@
-
-
- HUMAN
- FEMALE
-
-
+
+ ANIMAL
+ MALE
+
+
+
+
+
+
+
+
-
-
+
+
+ 370
-
+
+
+
+
+
+
+
+
+
+