Home Explore Help
Register Sign In
L2j
/
l2j-server-datapack
2
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

BETA: fix Tiad quest
* Html fixed by CostyKiller
* NPE checker and better logger for QuestLiny by UnAfraid
* Fixed bad name for Stage1 super call
* Little clean from [10436]

Zealar 10 years ago
parent
a487f1bd51
commit
4ccb5e7c38
6 changed files with 12 additions and 12 deletions
Unified View Show Diff Stats
  1. 1 1
      L2J_DataPack_BETA/dist/game/data/html/default/32526.htm
  2. 1 1
      L2J_DataPack_BETA/dist/game/data/scripts/gracia/instances/SeedOfDestruction/Stage1.java
  3. 10 4
      L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java
  4. 0 2
      L2J_DataPack_BETA/dist/game/data/stats/skills/01100-01199.xml
  5. 0 2
      L2J_DataPack_BETA/dist/game/data/stats/skills/01300-01399.xml
  6. 0 2
      L2J_DataPack_BETA/dist/game/data/stats/skills/01500-01599.xml

+ 1 - 1
L2J_DataPack_BETA/dist/game/data/html/default/32526.htm
View File 

@@ -1,6 +1,6 @@
 
 <html><body>Sergeant Allenos:<br>

 <html><body>Sergeant Allenos:<br>

 Shhh! Be quiet! There are Dragonkins not far from the <font color="LEVEL">Secret Airstrip</font>!<br>

 Shhh! Be quiet! There are Dragonkins not far from the <font color="LEVEL">Secret Airstrip</font>!<br>

-<a action="bypass -h npc_%objectId%_Quest SoDStage1">Enter the Seed of Destruction.</a><br>

+<a action="bypass -h npc_%objectId%_Quest Stage1">Enter the Seed of Destruction.</a><br>

 <a action="bypass -h npc_%objectId%_Chat 1">Learn about the Seed of Destruction.</a><br>

 <a action="bypass -h npc_%objectId%_Chat 1">Learn about the Seed of Destruction.</a><br>

 <a action="bypass -h npc_%objectId%_Quest">Quest</a>

 <a action="bypass -h npc_%objectId%_Quest">Quest</a>

 </body></html>
 
 </body></html>

+ 1 - 1
L2J_DataPack_BETA/dist/game/data/scripts/gracia/instances/SeedOfDestruction/Stage1.java
View File 

@@ -218,7 +218,7 @@ public final class Stage1 extends Quest
 
 	public Stage1()

 	public Stage1()

 	{

 	{

 		// TODO change name to use actual class name

 		// TODO change name to use actual class name

-		super(-1, "SoDStage1", "gracia/instances");

+		super(-1, "Stage1", "gracia/instances");

 		load();

 		load();

 		addStartNpc(ALENOS);

 		addStartNpc(ALENOS);

 		addTalkId(ALENOS);

 		addTalkId(ALENOS);

+ 10 - 4
L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java
View File 

@@ -19,6 +19,7 @@
 
 package handlers.bypasshandlers;

 package handlers.bypasshandlers;

 

 

 import java.util.List;

 import java.util.List;

+import java.util.logging.Level;

 

 

 import javolution.util.FastList;

 import javolution.util.FastList;

 

 

@@ -250,13 +251,18 @@ public class QuestLink implements IBypassHandler
 
 		// By limiting them there, we are allowed to create custom quests at higher IDs without interfering

 		// By limiting them there, we are allowed to create custom quests at higher IDs without interfering

 		if (awaits != null)

 		if (awaits != null)

 		{

 		{

-			for (QuestState x : awaits)

+			for (QuestState state : awaits)

 			{

 			{

-				if (!options.contains(x.getQuest()))

+				if (state.getQuest() == null)

 				{

 				{

-					if ((x.getQuest().getId() > 0) && (x.getQuest().getId() < 20000))

+					_log.log(Level.WARNING, player + " Requested incorrect quest state for non existing quest: " + state.getQuestName());

+					continue;

+				}

+				if (!options.contains(state.getQuest()))

+				{

+					if ((state.getQuest().getId() > 0) && (state.getQuest().getId() < 20000))

 					{

 					{

-						options.add(x.getQuest());

+						options.add(state.getQuest());

 					}

 					}

 				}

 				}

 			}

 			}

+ 0 - 2
L2J_DataPack_BETA/dist/game/data/stats/skills/01100-01199.xml
View File 

@@ -687,8 +687,6 @@
 
 		<set name="hitTime" val="4000" />

 		<set name="hitTime" val="4000" />

 		<set name="icon" val="icon.skill1148" />

 		<set name="icon" val="icon.skill1148" />

 		<set name="isMagic" val="1" /> <!-- Magic Skill -->

 		<set name="isMagic" val="1" /> <!-- Magic Skill -->

-		<set name="itemConsumeCount" val="1" />

-		<set name="itemConsumeId" val="2508" /> <!-- Cursed Bone -->

 		<set name="magicLvl" val="#magicLvl" />

 		<set name="magicLvl" val="#magicLvl" />

 		<set name="mpConsume" val="#mpConsume" />

 		<set name="mpConsume" val="#mpConsume" />

 		<set name="mpInitialConsume" val="#mpInitialConsume" />

 		<set name="mpInitialConsume" val="#mpInitialConsume" />

+ 0 - 2
L2J_DataPack_BETA/dist/game/data/stats/skills/01300-01399.xml
View File 

@@ -2568,8 +2568,6 @@
 
 		<set name="icon" val="icon.skill1382" />

 		<set name="icon" val="icon.skill1382" />

 		<set name="isDebuff" val="true" />

 		<set name="isDebuff" val="true" />

 		<set name="isMagic" val="1" /> <!-- Magic Skill -->

 		<set name="isMagic" val="1" /> <!-- Magic Skill -->

-		<set name="itemConsumeCount" val="4" />

-		<set name="itemConsumeId" val="2508" /> <!-- Cursed Bone -->

 		<set name="lvlBonusRate" val="1" />

 		<set name="lvlBonusRate" val="1" />

 		<set name="magicLvl" val="#magicLvl" />

 		<set name="magicLvl" val="#magicLvl" />

 		<set name="mpConsume" val="#mpConsume" />

 		<set name="mpConsume" val="#mpConsume" />

+ 0 - 2
L2J_DataPack_BETA/dist/game/data/stats/skills/01500-01599.xml
View File 

@@ -978,8 +978,6 @@
 
 		<set name="hitTime" val="4000" />

 		<set name="hitTime" val="4000" />

 		<set name="icon" val="icon.skill1148" />

 		<set name="icon" val="icon.skill1148" />

 		<set name="isMagic" val="1" /> <!-- Magic Skill -->

 		<set name="isMagic" val="1" /> <!-- Magic Skill -->

-		<set name="itemConsumeCount" val="1" />

-		<set name="itemConsumeId" val="2508" /> <!-- Cursed Bone -->

 		<set name="magicLvl" val="#magicLvl" />

 		<set name="magicLvl" val="#magicLvl" />

 		<set name="mpConsume" val="#mpConsume" />

 		<set name="mpConsume" val="#mpConsume" />

 		<set name="mpInitialConsume" val="#mpConsume_Init" />

 		<set name="mpInitialConsume" val="#mpConsume_Init" />