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

Initial party count should be saved in instance parameters.

Browse Source
This commit is contained in:
MobiusDevelopment
2022-05-12 14:03:46 +00:00
parent 8c587fd0ea
commit df30d03cb9
3 changed files with 15 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/KrofinNest/KrofinNest.java vendored
View File

@@ -110,7 +110,6 @@ public class KrofinNest extends AbstractInstance
291, // lv. 105 291, // lv. 105
315, // lv. 110 315, // lv. 110
}; };
private static int INITIAL_PARTY_MEMBERS = 0;
private static final int DOOR1 = 23220101; private static final int DOOR1 = 23220101;
private static final int DOOR2 = 24250002; private static final int DOOR2 = 24250002;
private static final int DOOR3 = 24250004; private static final int DOOR3 = 24250004;
@@ -431,7 +430,7 @@ public class KrofinNest extends AbstractInstance
@Override @Override
public void onInstanceCreated(Instance instance, Player player) public void onInstanceCreated(Instance instance, Player player)
{ {
INITIAL_PARTY_MEMBERS = (player.getParty() != null ? player.getParty().getMemberCount() : 1); instance.getParameters().set("INITIAL_PARTY_MEMBERS", player.getParty() != null ? player.getParty().getMemberCount() : 1);
} }
@Override @Override
@@ -474,15 +473,9 @@ public class KrofinNest extends AbstractInstance
{ {
giveItems(member, BENUSTAS_REWARD_BOX); giveItems(member, BENUSTAS_REWARD_BOX);
} }
if (world.getPlayersCount() == INITIAL_PARTY_MEMBERS) if ((randomPl != null) && (getRandom(100) < 80) && (world.getPlayersCount() == world.getParameters().getInt("INITIAL_PARTY_MEMBERS", 0)))
{ {
if (getRandom(100) < 80) giveItems(randomPl, BENUSTAS_SHINING_REWARD_BOX);
{
if (randomPl != null)
{
giveItems(randomPl, BENUSTAS_SHINING_REWARD_BOX);
}
}
} }
showOnScreenMsg(world, NpcStringId.THE_WATER_POWER_PROTECTING_QUEEN_KROSHA_HAS_DISAPPEARED, ExShowScreenMessage.TOP_CENTER, 7000, true); showOnScreenMsg(world, NpcStringId.THE_WATER_POWER_PROTECTING_QUEEN_KROSHA_HAS_DISAPPEARED, ExShowScreenMessage.TOP_CENTER, 7000, true);
world.finishInstance(); world.finishInstance();
@@ -493,15 +486,9 @@ public class KrofinNest extends AbstractInstance
{ {
giveItems(member, BENUSTAS_REWARD_BOX_110); giveItems(member, BENUSTAS_REWARD_BOX_110);
} }
if (world.getPlayersCount() == INITIAL_PARTY_MEMBERS) if ((randomPl != null) && (getRandom(100) < 80) && (world.getPlayersCount() == world.getParameters().getInt("INITIAL_PARTY_MEMBERS", 0)))
{ {
if (getRandom(100) < 80) giveItems(randomPl, BENUSTAS_SHINING_REWARD_BOX);
{
if (randomPl != null)
{
giveItems(randomPl, BENUSTAS_SHINING_REWARD_BOX);
}
}
} }
showOnScreenMsg(world, NpcStringId.THE_WATER_POWER_PROTECTING_QUEEN_KROSHA_HAS_DISAPPEARED, ExShowScreenMessage.TOP_CENTER, 7000, true); showOnScreenMsg(world, NpcStringId.THE_WATER_POWER_PROTECTING_QUEEN_KROSHA_HAS_DISAPPEARED, ExShowScreenMessage.TOP_CENTER, 7000, true);
world.finishInstance(); world.finishInstance();

23
L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/instances/KrofinNest/KrofinNest.java vendored
View File

@@ -110,7 +110,6 @@ public class KrofinNest extends AbstractInstance
291, // lv. 105 291, // lv. 105
315, // lv. 110 315, // lv. 110
}; };
private static int INITIAL_PARTY_MEMBERS = 0;
private static final int DOOR1 = 23220101; private static final int DOOR1 = 23220101;
private static final int DOOR2 = 24250002; private static final int DOOR2 = 24250002;
private static final int DOOR3 = 24250004; private static final int DOOR3 = 24250004;
@@ -431,7 +430,7 @@ public class KrofinNest extends AbstractInstance
@Override @Override
public void onInstanceCreated(Instance instance, Player player) public void onInstanceCreated(Instance instance, Player player)
{ {
INITIAL_PARTY_MEMBERS = (player.getParty() != null ? player.getParty().getMemberCount() : 1); instance.getParameters().set("INITIAL_PARTY_MEMBERS", player.getParty() != null ? player.getParty().getMemberCount() : 1);
} }
@Override @Override
@@ -474,15 +473,9 @@ public class KrofinNest extends AbstractInstance
{ {
giveItems(member, BENUSTAS_REWARD_BOX); giveItems(member, BENUSTAS_REWARD_BOX);
} }
if (world.getPlayersCount() == INITIAL_PARTY_MEMBERS) if ((randomPl != null) && (getRandom(100) < 80) && (world.getPlayersCount() == world.getParameters().getInt("INITIAL_PARTY_MEMBERS", 0)))
{ {
if (getRandom(100) < 80) giveItems(randomPl, BENUSTAS_SHINING_REWARD_BOX);
{
if (randomPl != null)
{
giveItems(randomPl, BENUSTAS_SHINING_REWARD_BOX);
}
}
} }
showOnScreenMsg(world, NpcStringId.THE_WATER_POWER_PROTECTING_QUEEN_KROSHA_HAS_DISAPPEARED, ExShowScreenMessage.TOP_CENTER, 7000, true); showOnScreenMsg(world, NpcStringId.THE_WATER_POWER_PROTECTING_QUEEN_KROSHA_HAS_DISAPPEARED, ExShowScreenMessage.TOP_CENTER, 7000, true);
world.finishInstance(); world.finishInstance();
@@ -493,15 +486,9 @@ public class KrofinNest extends AbstractInstance
{ {
giveItems(member, BENUSTAS_REWARD_BOX_110); giveItems(member, BENUSTAS_REWARD_BOX_110);
} }
if (world.getPlayersCount() == INITIAL_PARTY_MEMBERS) if ((randomPl != null) && (getRandom(100) < 80) && (world.getPlayersCount() == world.getParameters().getInt("INITIAL_PARTY_MEMBERS", 0)))
{ {
if (getRandom(100) < 80) giveItems(randomPl, BENUSTAS_SHINING_REWARD_BOX);
{
if (randomPl != null)
{
giveItems(randomPl, BENUSTAS_SHINING_REWARD_BOX);
}
}
} }
showOnScreenMsg(world, NpcStringId.THE_WATER_POWER_PROTECTING_QUEEN_KROSHA_HAS_DISAPPEARED, ExShowScreenMessage.TOP_CENTER, 7000, true); showOnScreenMsg(world, NpcStringId.THE_WATER_POWER_PROTECTING_QUEEN_KROSHA_HAS_DISAPPEARED, ExShowScreenMessage.TOP_CENTER, 7000, true);
world.finishInstance(); world.finishInstance();

23
L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/instances/KrofinNest/KrofinNest.java vendored
View File

@@ -110,7 +110,6 @@ public class KrofinNest extends AbstractInstance
291, // lv. 105 291, // lv. 105
315, // lv. 110 315, // lv. 110
}; };
private static int INITIAL_PARTY_MEMBERS = 0;
private static final int DOOR1 = 23220101; private static final int DOOR1 = 23220101;
private static final int DOOR2 = 24250002; private static final int DOOR2 = 24250002;
private static final int DOOR3 = 24250004; private static final int DOOR3 = 24250004;
@@ -431,7 +430,7 @@ public class KrofinNest extends AbstractInstance
@Override @Override
public void onInstanceCreated(Instance instance, Player player) public void onInstanceCreated(Instance instance, Player player)
{ {
INITIAL_PARTY_MEMBERS = (player.getParty() != null ? player.getParty().getMemberCount() : 1); instance.getParameters().set("INITIAL_PARTY_MEMBERS", player.getParty() != null ? player.getParty().getMemberCount() : 1);
} }
@Override @Override
@@ -474,15 +473,9 @@ public class KrofinNest extends AbstractInstance
{ {
giveItems(member, BENUSTAS_REWARD_BOX); giveItems(member, BENUSTAS_REWARD_BOX);
} }
if (world.getPlayersCount() == INITIAL_PARTY_MEMBERS) if ((randomPl != null) && (getRandom(100) < 80) && (world.getPlayersCount() == world.getParameters().getInt("INITIAL_PARTY_MEMBERS", 0)))
{ {
if (getRandom(100) < 80) giveItems(randomPl, BENUSTAS_SHINING_REWARD_BOX);
{
if (randomPl != null)
{
giveItems(randomPl, BENUSTAS_SHINING_REWARD_BOX);
}
}
} }
showOnScreenMsg(world, NpcStringId.THE_WATER_POWER_PROTECTING_QUEEN_KROSHA_HAS_DISAPPEARED, ExShowScreenMessage.TOP_CENTER, 7000, true); showOnScreenMsg(world, NpcStringId.THE_WATER_POWER_PROTECTING_QUEEN_KROSHA_HAS_DISAPPEARED, ExShowScreenMessage.TOP_CENTER, 7000, true);
world.finishInstance(); world.finishInstance();
@@ -493,15 +486,9 @@ public class KrofinNest extends AbstractInstance
{ {
giveItems(member, BENUSTAS_REWARD_BOX_110); giveItems(member, BENUSTAS_REWARD_BOX_110);
} }
if (world.getPlayersCount() == INITIAL_PARTY_MEMBERS) if ((randomPl != null) && (getRandom(100) < 80) && (world.getPlayersCount() == world.getParameters().getInt("INITIAL_PARTY_MEMBERS", 0)))
{ {
if (getRandom(100) < 80) giveItems(randomPl, BENUSTAS_SHINING_REWARD_BOX);
{
if (randomPl != null)
{
giveItems(randomPl, BENUSTAS_SHINING_REWARD_BOX);
}
}
} }
showOnScreenMsg(world, NpcStringId.THE_WATER_POWER_PROTECTING_QUEEN_KROSHA_HAS_DISAPPEARED, ExShowScreenMessage.TOP_CENTER, 7000, true); showOnScreenMsg(world, NpcStringId.THE_WATER_POWER_PROTECTING_QUEEN_KROSHA_HAS_DISAPPEARED, ExShowScreenMessage.TOP_CENTER, 7000, true);
world.finishInstance(); world.finishInstance();