lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Partial sync L2jUnity free release Feb 16th 2015.

Browse Source
This commit is contained in:
MobiusDev
2016-10-23 14:56:34 +00:00
parent 89d5331c99
commit be6443a66a
106 changed files with 1866 additions and 1803 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
L2J_Mobius_Test/dist/game/data/scripts/instances/AbstractInstance.java vendored
View File

@@ -52,6 +52,11 @@ public abstract class AbstractInstance extends AbstractNpcAI
super(name, "instances");
}
protected void enterInstance(L2PcInstance player, String template, int templateId)
{
enterInstance(player, new InstanceWorld(), template, templateId);
}
protected void enterInstance(L2PcInstance player, InstanceWorld instance, String template, int templateId)
{
final InstanceWorld world = InstanceManager.getInstance().getPlayerWorld(player);

6
L2J_Mobius_Test/dist/game/data/scripts/instances/ElcadiasTent/ElcadiasTent.java vendored
View File

@@ -44,10 +44,6 @@ public final class ElcadiasTent extends AbstractInstance
// Misc
private static final int TEMPLATE_ID = 158;
class ETWorld extends InstanceWorld
{
}
public ElcadiasTent()
{
super(ElcadiasTent.class.getSimpleName());
@@ -71,7 +67,7 @@ public final class ElcadiasTent extends AbstractInstance
|| ((ForbiddenBook != null) && ForbiddenBook.isCompleted() && (Monastery == null)) //
|| ((PowerOfSeal != null) && PowerOfSeal.isStarted()))
{
enterInstance(talker, new ETWorld(), "ElcadiasTent.xml", TEMPLATE_ID);
enterInstance(talker, "ElcadiasTent.xml", TEMPLATE_ID);
}
else
{

6
L2J_Mobius_Test/dist/game/data/scripts/instances/FaeronTrainingGrounds1/FaeronTrainingGrounds1.java vendored
View File

@@ -43,10 +43,6 @@ public final class FaeronTrainingGrounds1 extends AbstractInstance
// Misc
private static final int TEMPLATE_ID = 251;
class FTGWorld extends InstanceWorld
{
}
@Override
public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
{
@@ -58,7 +54,7 @@ public final class FaeronTrainingGrounds1 extends AbstractInstance
if (event.equals("enter_instance"))
{
enterInstance(player, new FTGWorld(), "FaeronTrainingGrounds1.xml", TEMPLATE_ID);
enterInstance(player, "FaeronTrainingGrounds1.xml", TEMPLATE_ID);
}
else if (event.equals("exit_instance"))
{

6
L2J_Mobius_Test/dist/game/data/scripts/instances/FaeronTrainingGrounds2/FaeronTrainingGrounds2.java vendored
View File

@@ -43,10 +43,6 @@ public final class FaeronTrainingGrounds2 extends AbstractInstance
// Misc
private static final int TEMPLATE_ID = 252;
class FTGWorld extends InstanceWorld
{
}
@Override
public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
{
@@ -58,7 +54,7 @@ public final class FaeronTrainingGrounds2 extends AbstractInstance
if (event.equals("enter_instance"))
{
enterInstance(player, new FTGWorld(), "FaeronTrainingGrounds2.xml", TEMPLATE_ID);
enterInstance(player, "FaeronTrainingGrounds2.xml", TEMPLATE_ID);
}
else if (event.equals("exit_instance"))
{

31
L2J_Mobius_Test/dist/game/data/scripts/instances/HarnakUndergroundRuins/HarnakUndergroundRuins.java vendored
View File

@@ -16,7 +16,6 @@
*/
package instances.HarnakUndergroundRuins;
import java.util.Collections;
import java.util.List;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
@@ -45,6 +44,21 @@ import instances.AbstractInstance;
*/
public final class HarnakUndergroundRuins extends AbstractInstance
{
protected class HuRWorld extends InstanceWorld
{
protected int wave = 0;
protected int currentNpc = 0;
protected int waveNpcId = 0;
protected int maximalDefenseCounter = 0;
protected int timerCount = 0;
protected int enabledSeal = 0;
protected Set<L2Npc> spawnedNpc = ConcurrentHashMap.newKeySet();
protected boolean openingPlayed = false;
protected boolean harnakMessage1 = false;
protected boolean harnakMessage2 = false;
protected boolean harnakMessage3 = false;
}
// NPCs
private static final int HADEL = 33344;
private static final int KRAKIA_BATHUS = 27437;
@@ -83,21 +97,6 @@ public final class HarnakUndergroundRuins extends AbstractInstance
private static final int DOOR_ONE = 16240100;
private static final int DOOR_TWO = 16240102;
class HuRWorld extends InstanceWorld
{
int wave = 0;
int currentNpc = 0;
int waveNpcId = 0;
int maximalDefenseCounter = 0;
int timerCount = 0;
int enabledSeal = 0;
final Set<L2Npc> spawnedNpc = Collections.newSetFromMap(new ConcurrentHashMap<L2Npc, Boolean>());
boolean openingPlayed = false;
boolean harnakMessage1 = false;
boolean harnakMessage2 = false;
boolean harnakMessage3 = false;
}
public HarnakUndergroundRuins()
{
super(HarnakUndergroundRuins.class.getSimpleName());

6
L2J_Mobius_Test/dist/game/data/scripts/instances/HideoutOfTheDawn/HideoutOfTheDawn.java vendored
View File

@@ -39,10 +39,6 @@ public final class HideoutOfTheDawn extends AbstractInstance
// Misc
private static final int TEMPLATE_ID = 113;
class HotDWorld extends InstanceWorld
{
}
public HideoutOfTheDawn()
{
super(HideoutOfTheDawn.class.getSimpleName());
@@ -57,7 +53,7 @@ public final class HideoutOfTheDawn extends AbstractInstance
{
case WOOD:
{
enterInstance(talker, new HotDWorld(), "HideoutOfTheDawn.xml", TEMPLATE_ID);
enterInstance(talker, "HideoutOfTheDawn.xml", TEMPLATE_ID);
return "32593-01.htm";
}
case JAINA:

6
L2J_Mobius_Test/dist/game/data/scripts/instances/JiniaGuildHideout1/JiniaGuildHideout1.java vendored
View File

@@ -38,10 +38,6 @@ public final class JiniaGuildHideout1 extends AbstractInstance
// Misc
private static final int TEMPLATE_ID = 140;
class JGH1World extends InstanceWorld
{
}
public JiniaGuildHideout1()
{
super(JiniaGuildHideout1.class.getSimpleName());
@@ -55,7 +51,7 @@ public final class JiniaGuildHideout1 extends AbstractInstance
final QuestState qs = talker.getQuestState(Q10284_AcquisitionOfDivineSword.class.getSimpleName());
if ((qs != null) && qs.isCond(1))
{
enterInstance(talker, new JGH1World(), "JiniaGuildHideout1.xml", TEMPLATE_ID);
enterInstance(talker, "JiniaGuildHideout1.xml", TEMPLATE_ID);
qs.setCond(2, true);
}
return super.onTalk(npc, talker);

6
L2J_Mobius_Test/dist/game/data/scripts/instances/JiniaGuildHideout2/JiniaGuildHideout2.java vendored
View File

@@ -38,10 +38,6 @@ public final class JiniaGuildHideout2 extends AbstractInstance
// Misc
private static final int TEMPLATE_ID = 141;
class JGH2World extends InstanceWorld
{
}
public JiniaGuildHideout2()
{
super(JiniaGuildHideout2.class.getSimpleName());
@@ -55,7 +51,7 @@ public final class JiniaGuildHideout2 extends AbstractInstance
final QuestState qs = talker.getQuestState(Q10285_MeetingSirra.class.getSimpleName());
if ((qs != null) && qs.isMemoState(1))
{
enterInstance(talker, new JGH2World(), "JiniaGuildHideout2.xml", TEMPLATE_ID);
enterInstance(talker, "JiniaGuildHideout2.xml", TEMPLATE_ID);
qs.setCond(2, true);
}
return super.onTalk(npc, talker);

6
L2J_Mobius_Test/dist/game/data/scripts/instances/JiniaGuildHideout3/JiniaGuildHideout3.java vendored
View File

@@ -38,10 +38,6 @@ public final class JiniaGuildHideout3 extends AbstractInstance
// Misc
private static final int TEMPLATE_ID = 145;
class JGH3World extends InstanceWorld
{
}
public JiniaGuildHideout3()
{
super(JiniaGuildHideout3.class.getSimpleName());
@@ -55,7 +51,7 @@ public final class JiniaGuildHideout3 extends AbstractInstance
final QuestState qs = talker.getQuestState(Q10286_ReunionWithSirra.class.getSimpleName());
if ((qs != null) && qs.isMemoState(1))
{
enterInstance(talker, new JGH3World(), "JiniaGuildHideout3.xml", TEMPLATE_ID);
enterInstance(talker, "JiniaGuildHideout3.xml", TEMPLATE_ID);
qs.setCond(2, true);
}
return super.onTalk(npc, talker);

6
L2J_Mobius_Test/dist/game/data/scripts/instances/JiniaGuildHideout4/JiniaGuildHideout4.java vendored
View File

@@ -38,10 +38,6 @@ public final class JiniaGuildHideout4 extends AbstractInstance
// Misc
private static final int TEMPLATE_ID = 146;
class JGH4World extends InstanceWorld
{
}
public JiniaGuildHideout4()
{
super(JiniaGuildHideout4.class.getSimpleName());
@@ -55,7 +51,7 @@ public final class JiniaGuildHideout4 extends AbstractInstance
final QuestState qs = talker.getQuestState(Q10287_StoryOfThoseLeft.class.getSimpleName());
if ((qs != null) && qs.isMemoState(1))
{
enterInstance(talker, new JGH4World(), "JiniaGuildHideout4.xml", TEMPLATE_ID);
enterInstance(talker, "JiniaGuildHideout4.xml", TEMPLATE_ID);
qs.setCond(2, true);
}
return super.onTalk(npc, talker);

6
L2J_Mobius_Test/dist/game/data/scripts/instances/PailakaSongOfIceAndFire/PailakaSongOfIceAndFire.java vendored
View File

@@ -51,10 +51,6 @@ public final class PailakaSongOfIceAndFire extends AbstractInstance
private static final int TEMPLATE_ID = 43;
private static final int ZONE = 20108;
class PSoIWorld extends InstanceWorld
{
}
public PailakaSongOfIceAndFire()
{
super(PailakaSongOfIceAndFire.class.getSimpleName());
@@ -84,7 +80,7 @@ public final class PailakaSongOfIceAndFire extends AbstractInstance
{
case "enter":
{
enterInstance(player, new PSoIWorld(), "PailakaSongOfIceAndFire.xml", TEMPLATE_ID);
enterInstance(player, "PailakaSongOfIceAndFire.xml", TEMPLATE_ID);
break;
}
case "GARGOS_LAUGH":