From e69dc07c7a8ef39f16fb252ed86a55b06a5e1ab0 Mon Sep 17 00:00:00 2001
From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Sun, 13 Aug 2017 20:23:15 +0000
Subject: [PATCH] Start of Fate quest improvements. Contributed by Stayway.
---
.../quests/Q10331_StartOfFate/32146-04.html | 3 ++
.../quests/Q10331_StartOfFate/32147-04.html | 3 ++
.../quests/Q10331_StartOfFate/32150-04.html | 3 ++
.../quests/Q10331_StartOfFate/32153-04.html | 3 ++
.../quests/Q10331_StartOfFate/32157-04.html | 3 ++
.../quests/Q10331_StartOfFate/32160-04.html | 3 ++
.../Q10331_StartOfFate.java | 48 ++++++++++++++-----
L2J_Mobius_Helios/readme.txt | 1 +
8 files changed, 55 insertions(+), 12 deletions(-)
create mode 100644 L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10331_StartOfFate/32146-04.html
create mode 100644 L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10331_StartOfFate/32147-04.html
create mode 100644 L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10331_StartOfFate/32150-04.html
create mode 100644 L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10331_StartOfFate/32153-04.html
create mode 100644 L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10331_StartOfFate/32157-04.html
create mode 100644 L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10331_StartOfFate/32160-04.html
diff --git a/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10331_StartOfFate/32146-04.html b/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10331_StartOfFate/32146-04.html
new file mode 100644
index 0000000000..6cb0597774
--- /dev/null
+++ b/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10331_StartOfFate/32146-04.html
@@ -0,0 +1,3 @@
+Grand Master Valfar:
+See the master for your race. I am Kamael. You are not.
+
\ No newline at end of file
diff --git a/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10331_StartOfFate/32147-04.html b/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10331_StartOfFate/32147-04.html
new file mode 100644
index 0000000000..12c509487d
--- /dev/null
+++ b/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10331_StartOfFate/32147-04.html
@@ -0,0 +1,3 @@
+Grand Master Rivian:
+See the master for your race. I am Elven. You are not.
+
\ No newline at end of file
diff --git a/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10331_StartOfFate/32150-04.html b/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10331_StartOfFate/32150-04.html
new file mode 100644
index 0000000000..d6ed168c27
--- /dev/null
+++ b/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10331_StartOfFate/32150-04.html
@@ -0,0 +1,3 @@
+High Prefect Took:
+See the master for your race. I am Orc. You are not.
+
\ No newline at end of file
diff --git a/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10331_StartOfFate/32153-04.html b/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10331_StartOfFate/32153-04.html
new file mode 100644
index 0000000000..fa9929cb70
--- /dev/null
+++ b/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10331_StartOfFate/32153-04.html
@@ -0,0 +1,3 @@
+High Priest Franco:
+See the master for your race. I am Human. You are not.
+
\ No newline at end of file
diff --git a/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10331_StartOfFate/32157-04.html b/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10331_StartOfFate/32157-04.html
new file mode 100644
index 0000000000..a5afda5fcd
--- /dev/null
+++ b/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10331_StartOfFate/32157-04.html
@@ -0,0 +1,3 @@
+Head Blacksmith Moka:
+See the master for your race. I am Dwarf. You are not.
+
\ No newline at end of file
diff --git a/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10331_StartOfFate/32160-04.html b/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10331_StartOfFate/32160-04.html
new file mode 100644
index 0000000000..792e463fa7
--- /dev/null
+++ b/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10331_StartOfFate/32160-04.html
@@ -0,0 +1,3 @@
+Grand Magister Devon:
+See the master for your race. I am Dark Elf. You are not.
+
\ No newline at end of file
diff --git a/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10331_StartOfFate/Q10331_StartOfFate.java b/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10331_StartOfFate/Q10331_StartOfFate.java
index 7f89f2bd76..f61cf9dadb 100644
--- a/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10331_StartOfFate/Q10331_StartOfFate.java
+++ b/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10331_StartOfFate/Q10331_StartOfFate.java
@@ -298,9 +298,9 @@ public final class Q10331_StartOfFate extends Quest
{
case FRANCO:
{
- if ((qs.getCond() >= 3) && (qs.getCond() <= 8))
+ if (player.getRace() == Race.HUMAN)
{
- if (player.getRace() == Race.HUMAN)
+ if ((qs.getCond() >= 3) && (qs.getCond() <= 8))
{
switch (player.getClassId())
{
@@ -318,13 +318,17 @@ public final class Q10331_StartOfFate extends Quest
break;
}
}
+ else
+ {
+ htmltext = "32153-04.html";
+ }
break;
}
case RIVIAN:
{
- if ((qs.getCond() >= 3) && (qs.getCond() <= 8))
+ if (player.getRace() == Race.ELF)
{
- if (player.getRace() == Race.ELF)
+ if ((qs.getCond() >= 3) && (qs.getCond() <= 8))
{
switch (player.getClassId())
{
@@ -342,13 +346,17 @@ public final class Q10331_StartOfFate extends Quest
break;
}
}
+ else
+ {
+ htmltext = "32147-04.html";
+ }
break;
}
case DEVON:
{
- if ((qs.getCond() >= 3) && (qs.getCond() <= 8))
+ if (player.getRace() == Race.DARK_ELF)
{
- if (player.getRace() == Race.DARK_ELF)
+ if ((qs.getCond() >= 3) && (qs.getCond() <= 8))
{
switch (player.getClassId())
{
@@ -366,13 +374,17 @@ public final class Q10331_StartOfFate extends Quest
break;
}
}
+ else
+ {
+ htmltext = "32160-04.html";
+ }
break;
}
case TOOK:
{
- if ((qs.getCond() >= 3) && (qs.getCond() <= 8))
+ if (player.getRace() == Race.ORC)
{
- if (player.getRace() == Race.ORC)
+ if ((qs.getCond() >= 3) && (qs.getCond() <= 8))
{
switch (player.getClassId())
{
@@ -390,25 +402,33 @@ public final class Q10331_StartOfFate extends Quest
break;
}
}
+ else
+ {
+ htmltext = "32150-04.html";
+ }
break;
}
case MOKA:
{
- if ((qs.getCond() >= 3) && (qs.getCond() <= 8))
+ if (player.getRace() == Race.DWARF)
{
- if (player.getRace() == Race.DWARF)
+ if ((qs.getCond() >= 3) && (qs.getCond() <= 8))
{
htmltext = "32157-07.html";
break;
}
}
+ else
+ {
+ htmltext = "32157-04.html";
+ }
break;
}
case VALFAR:
{
- if ((qs.getCond() >= 3) && (qs.getCond() <= 8))
+ if (player.getRace() == Race.KAMAEL)
{
- if (player.getRace() == Race.KAMAEL)
+ if ((qs.getCond() >= 3) && (qs.getCond() <= 8))
{
switch (player.getClassId())
{
@@ -426,6 +446,10 @@ public final class Q10331_StartOfFate extends Quest
break;
}
}
+ else
+ {
+ htmltext = "32146-04.html";
+ }
break;
}
case SEBION:
diff --git a/L2J_Mobius_Helios/readme.txt b/L2J_Mobius_Helios/readme.txt
index 9bb51f7e56..a66457bb84 100644
--- a/L2J_Mobius_Helios/readme.txt
+++ b/L2J_Mobius_Helios/readme.txt
@@ -25,3 +25,4 @@ TODO list
-Underground five man dungeons
-Check all quests rewards
-Kamaloka
+-Provisional Clan Halls