Pledge Mission additions.
Contributed by nasseka.
This commit is contained in:
@@ -25,6 +25,8 @@ import org.l2jmobius.gameserver.model.events.Containers;
|
|||||||
import org.l2jmobius.gameserver.model.events.EventType;
|
import org.l2jmobius.gameserver.model.events.EventType;
|
||||||
import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLevelChanged;
|
import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLevelChanged;
|
||||||
import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener;
|
import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener;
|
||||||
|
import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeMissionInfo;
|
||||||
|
import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeMissionRewardCount;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author Sdw
|
* @author Sdw
|
||||||
@@ -94,6 +96,11 @@ public class LevelDailyMissionHandler extends AbstractDailyMissionHandler
|
|||||||
private void onPlayerLevelChanged(OnPlayerLevelChanged event)
|
private void onPlayerLevelChanged(OnPlayerLevelChanged event)
|
||||||
{
|
{
|
||||||
final Player player = event.getPlayer();
|
final Player player = event.getPlayer();
|
||||||
|
if (player.getClan() == null)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
if ((player.getLevel() >= _level) && (player.isDualClassActive() == _dualclass))
|
if ((player.getLevel() >= _level) && (player.isDualClassActive() == _dualclass))
|
||||||
{
|
{
|
||||||
final DailyMissionPlayerEntry entry = getPlayerEntry(player.getObjectId(), true);
|
final DailyMissionPlayerEntry entry = getPlayerEntry(player.getObjectId(), true);
|
||||||
@@ -102,6 +109,8 @@ public class LevelDailyMissionHandler extends AbstractDailyMissionHandler
|
|||||||
entry.setStatus(DailyMissionStatus.AVAILABLE);
|
entry.setStatus(DailyMissionStatus.AVAILABLE);
|
||||||
storePlayerEntry(entry);
|
storePlayerEntry(entry);
|
||||||
}
|
}
|
||||||
|
player.sendPacket(new ExPledgeMissionRewardCount(player));
|
||||||
|
player.sendPacket(new ExPledgeMissionInfo(player));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -83,6 +83,8 @@ import org.l2jmobius.gameserver.network.serverpackets.PledgeSkillListAdd;
|
|||||||
import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
|
import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
|
||||||
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
|
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
|
||||||
import org.l2jmobius.gameserver.network.serverpackets.UserInfo;
|
import org.l2jmobius.gameserver.network.serverpackets.UserInfo;
|
||||||
|
import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeMissionInfo;
|
||||||
|
import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeMissionRewardCount;
|
||||||
import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeShowInfoUpdate;
|
import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeShowInfoUpdate;
|
||||||
import org.l2jmobius.gameserver.util.EnumIntBitmask;
|
import org.l2jmobius.gameserver.util.EnumIntBitmask;
|
||||||
import org.l2jmobius.gameserver.util.Util;
|
import org.l2jmobius.gameserver.util.Util;
|
||||||
@@ -395,6 +397,8 @@ public class Clan implements IIdentifiable, INamable
|
|||||||
player.setPledgeClass(PLEDGE_CLASS_COMMON);
|
player.setPledgeClass(PLEDGE_CLASS_COMMON);
|
||||||
player.sendPacket(new PledgeShowMemberListUpdate(player));
|
player.sendPacket(new PledgeShowMemberListUpdate(player));
|
||||||
player.sendPacket(new PledgeSkillList(this));
|
player.sendPacket(new PledgeSkillList(this));
|
||||||
|
player.sendPacket(new ExPledgeMissionRewardCount(player));
|
||||||
|
player.sendPacket(new ExPledgeMissionInfo(player));
|
||||||
addSkillEffects(player);
|
addSkillEffects(player);
|
||||||
|
|
||||||
// Notify to scripts
|
// Notify to scripts
|
||||||
|
@@ -55,15 +55,19 @@ public class ExPledgeMissionInfo extends ServerPacket
|
|||||||
// TODO: Figure out this.
|
// TODO: Figure out this.
|
||||||
if (reward.isLevelUpMission())
|
if (reward.isLevelUpMission())
|
||||||
{
|
{
|
||||||
progress = 1;
|
|
||||||
if (status == 2)
|
if (status == 2)
|
||||||
{
|
{
|
||||||
status = reward.getRequiredCompletions() > _player.getLevel() ? 1 : 3;
|
status = reward.getRequiredCompletions() > _player.getLevel() ? 1 : 3;
|
||||||
}
|
}
|
||||||
|
else if ((status == 3) && (progress == 3))
|
||||||
|
{
|
||||||
|
status = 0;
|
||||||
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
status = reward.isRecentlyCompleted(_player) ? 0 : 3;
|
status = reward.isRecentlyCompleted(_player) ? 0 : 3;
|
||||||
}
|
}
|
||||||
|
progress = 1;
|
||||||
}
|
}
|
||||||
else if (status == 1)
|
else if (status == 1)
|
||||||
{
|
{
|
||||||
|
@@ -25,6 +25,8 @@ import org.l2jmobius.gameserver.model.events.Containers;
|
|||||||
import org.l2jmobius.gameserver.model.events.EventType;
|
import org.l2jmobius.gameserver.model.events.EventType;
|
||||||
import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLevelChanged;
|
import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLevelChanged;
|
||||||
import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener;
|
import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener;
|
||||||
|
import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeMissionInfo;
|
||||||
|
import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeMissionRewardCount;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author Sdw
|
* @author Sdw
|
||||||
@@ -94,6 +96,11 @@ public class LevelDailyMissionHandler extends AbstractDailyMissionHandler
|
|||||||
private void onPlayerLevelChanged(OnPlayerLevelChanged event)
|
private void onPlayerLevelChanged(OnPlayerLevelChanged event)
|
||||||
{
|
{
|
||||||
final Player player = event.getPlayer();
|
final Player player = event.getPlayer();
|
||||||
|
if (player.getClan() == null)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
if ((player.getLevel() >= _level) && (player.isDualClassActive() == _dualclass))
|
if ((player.getLevel() >= _level) && (player.isDualClassActive() == _dualclass))
|
||||||
{
|
{
|
||||||
final DailyMissionPlayerEntry entry = getPlayerEntry(player.getObjectId(), true);
|
final DailyMissionPlayerEntry entry = getPlayerEntry(player.getObjectId(), true);
|
||||||
@@ -102,6 +109,8 @@ public class LevelDailyMissionHandler extends AbstractDailyMissionHandler
|
|||||||
entry.setStatus(DailyMissionStatus.AVAILABLE);
|
entry.setStatus(DailyMissionStatus.AVAILABLE);
|
||||||
storePlayerEntry(entry);
|
storePlayerEntry(entry);
|
||||||
}
|
}
|
||||||
|
player.sendPacket(new ExPledgeMissionRewardCount(player));
|
||||||
|
player.sendPacket(new ExPledgeMissionInfo(player));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -83,6 +83,8 @@ import org.l2jmobius.gameserver.network.serverpackets.PledgeSkillListAdd;
|
|||||||
import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
|
import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
|
||||||
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
|
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
|
||||||
import org.l2jmobius.gameserver.network.serverpackets.UserInfo;
|
import org.l2jmobius.gameserver.network.serverpackets.UserInfo;
|
||||||
|
import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeMissionInfo;
|
||||||
|
import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeMissionRewardCount;
|
||||||
import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeShowInfoUpdate;
|
import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeShowInfoUpdate;
|
||||||
import org.l2jmobius.gameserver.util.EnumIntBitmask;
|
import org.l2jmobius.gameserver.util.EnumIntBitmask;
|
||||||
import org.l2jmobius.gameserver.util.Util;
|
import org.l2jmobius.gameserver.util.Util;
|
||||||
@@ -395,6 +397,8 @@ public class Clan implements IIdentifiable, INamable
|
|||||||
player.setPledgeClass(PLEDGE_CLASS_COMMON);
|
player.setPledgeClass(PLEDGE_CLASS_COMMON);
|
||||||
player.sendPacket(new PledgeShowMemberListUpdate(player));
|
player.sendPacket(new PledgeShowMemberListUpdate(player));
|
||||||
player.sendPacket(new PledgeSkillList(this));
|
player.sendPacket(new PledgeSkillList(this));
|
||||||
|
player.sendPacket(new ExPledgeMissionRewardCount(player));
|
||||||
|
player.sendPacket(new ExPledgeMissionInfo(player));
|
||||||
addSkillEffects(player);
|
addSkillEffects(player);
|
||||||
|
|
||||||
// Notify to scripts
|
// Notify to scripts
|
||||||
|
@@ -55,15 +55,19 @@ public class ExPledgeMissionInfo extends ServerPacket
|
|||||||
// TODO: Figure out this.
|
// TODO: Figure out this.
|
||||||
if (reward.isLevelUpMission())
|
if (reward.isLevelUpMission())
|
||||||
{
|
{
|
||||||
progress = 1;
|
|
||||||
if (status == 2)
|
if (status == 2)
|
||||||
{
|
{
|
||||||
status = reward.getRequiredCompletions() > _player.getLevel() ? 1 : 3;
|
status = reward.getRequiredCompletions() > _player.getLevel() ? 1 : 3;
|
||||||
}
|
}
|
||||||
|
else if ((status == 3) && (progress == 3))
|
||||||
|
{
|
||||||
|
status = 0;
|
||||||
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
status = reward.isRecentlyCompleted(_player) ? 0 : 3;
|
status = reward.isRecentlyCompleted(_player) ? 0 : 3;
|
||||||
}
|
}
|
||||||
|
progress = 1;
|
||||||
}
|
}
|
||||||
else if (status == 1)
|
else if (status == 1)
|
||||||
{
|
{
|
||||||
|
@@ -25,6 +25,8 @@ import org.l2jmobius.gameserver.model.events.Containers;
|
|||||||
import org.l2jmobius.gameserver.model.events.EventType;
|
import org.l2jmobius.gameserver.model.events.EventType;
|
||||||
import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLevelChanged;
|
import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLevelChanged;
|
||||||
import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener;
|
import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener;
|
||||||
|
import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeMissionInfo;
|
||||||
|
import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeMissionRewardCount;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author Sdw
|
* @author Sdw
|
||||||
@@ -94,6 +96,11 @@ public class LevelDailyMissionHandler extends AbstractDailyMissionHandler
|
|||||||
private void onPlayerLevelChanged(OnPlayerLevelChanged event)
|
private void onPlayerLevelChanged(OnPlayerLevelChanged event)
|
||||||
{
|
{
|
||||||
final Player player = event.getPlayer();
|
final Player player = event.getPlayer();
|
||||||
|
if (player.getClan() == null)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
if ((player.getLevel() >= _level) && (player.isDualClassActive() == _dualclass))
|
if ((player.getLevel() >= _level) && (player.isDualClassActive() == _dualclass))
|
||||||
{
|
{
|
||||||
final DailyMissionPlayerEntry entry = getPlayerEntry(player.getObjectId(), true);
|
final DailyMissionPlayerEntry entry = getPlayerEntry(player.getObjectId(), true);
|
||||||
@@ -102,6 +109,8 @@ public class LevelDailyMissionHandler extends AbstractDailyMissionHandler
|
|||||||
entry.setStatus(DailyMissionStatus.AVAILABLE);
|
entry.setStatus(DailyMissionStatus.AVAILABLE);
|
||||||
storePlayerEntry(entry);
|
storePlayerEntry(entry);
|
||||||
}
|
}
|
||||||
|
player.sendPacket(new ExPledgeMissionRewardCount(player));
|
||||||
|
player.sendPacket(new ExPledgeMissionInfo(player));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -83,6 +83,8 @@ import org.l2jmobius.gameserver.network.serverpackets.PledgeSkillListAdd;
|
|||||||
import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
|
import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
|
||||||
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
|
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
|
||||||
import org.l2jmobius.gameserver.network.serverpackets.UserInfo;
|
import org.l2jmobius.gameserver.network.serverpackets.UserInfo;
|
||||||
|
import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeMissionInfo;
|
||||||
|
import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeMissionRewardCount;
|
||||||
import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeShowInfoUpdate;
|
import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeShowInfoUpdate;
|
||||||
import org.l2jmobius.gameserver.util.EnumIntBitmask;
|
import org.l2jmobius.gameserver.util.EnumIntBitmask;
|
||||||
import org.l2jmobius.gameserver.util.Util;
|
import org.l2jmobius.gameserver.util.Util;
|
||||||
@@ -395,6 +397,8 @@ public class Clan implements IIdentifiable, INamable
|
|||||||
player.setPledgeClass(PLEDGE_CLASS_COMMON);
|
player.setPledgeClass(PLEDGE_CLASS_COMMON);
|
||||||
player.sendPacket(new PledgeShowMemberListUpdate(player));
|
player.sendPacket(new PledgeShowMemberListUpdate(player));
|
||||||
player.sendPacket(new PledgeSkillList(this));
|
player.sendPacket(new PledgeSkillList(this));
|
||||||
|
player.sendPacket(new ExPledgeMissionRewardCount(player));
|
||||||
|
player.sendPacket(new ExPledgeMissionInfo(player));
|
||||||
addSkillEffects(player);
|
addSkillEffects(player);
|
||||||
|
|
||||||
// Notify to scripts
|
// Notify to scripts
|
||||||
|
@@ -55,15 +55,19 @@ public class ExPledgeMissionInfo extends ServerPacket
|
|||||||
// TODO: Figure out this.
|
// TODO: Figure out this.
|
||||||
if (reward.isLevelUpMission())
|
if (reward.isLevelUpMission())
|
||||||
{
|
{
|
||||||
progress = 1;
|
|
||||||
if (status == 2)
|
if (status == 2)
|
||||||
{
|
{
|
||||||
status = reward.getRequiredCompletions() > _player.getLevel() ? 1 : 3;
|
status = reward.getRequiredCompletions() > _player.getLevel() ? 1 : 3;
|
||||||
}
|
}
|
||||||
|
else if ((status == 3) && (progress == 3))
|
||||||
|
{
|
||||||
|
status = 0;
|
||||||
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
status = reward.isRecentlyCompleted(_player) ? 0 : 3;
|
status = reward.isRecentlyCompleted(_player) ? 0 : 3;
|
||||||
}
|
}
|
||||||
|
progress = 1;
|
||||||
}
|
}
|
||||||
else if (status == 1)
|
else if (status == 1)
|
||||||
{
|
{
|
||||||
|
@@ -25,6 +25,8 @@ import org.l2jmobius.gameserver.model.events.Containers;
|
|||||||
import org.l2jmobius.gameserver.model.events.EventType;
|
import org.l2jmobius.gameserver.model.events.EventType;
|
||||||
import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLevelChanged;
|
import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLevelChanged;
|
||||||
import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener;
|
import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener;
|
||||||
|
import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeMissionInfo;
|
||||||
|
import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeMissionRewardCount;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author Sdw
|
* @author Sdw
|
||||||
@@ -94,6 +96,11 @@ public class LevelDailyMissionHandler extends AbstractDailyMissionHandler
|
|||||||
private void onPlayerLevelChanged(OnPlayerLevelChanged event)
|
private void onPlayerLevelChanged(OnPlayerLevelChanged event)
|
||||||
{
|
{
|
||||||
final Player player = event.getPlayer();
|
final Player player = event.getPlayer();
|
||||||
|
if (player.getClan() == null)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
if ((player.getLevel() >= _level) && (player.isDualClassActive() == _dualclass))
|
if ((player.getLevel() >= _level) && (player.isDualClassActive() == _dualclass))
|
||||||
{
|
{
|
||||||
final DailyMissionPlayerEntry entry = getPlayerEntry(player.getObjectId(), true);
|
final DailyMissionPlayerEntry entry = getPlayerEntry(player.getObjectId(), true);
|
||||||
@@ -102,6 +109,8 @@ public class LevelDailyMissionHandler extends AbstractDailyMissionHandler
|
|||||||
entry.setStatus(DailyMissionStatus.AVAILABLE);
|
entry.setStatus(DailyMissionStatus.AVAILABLE);
|
||||||
storePlayerEntry(entry);
|
storePlayerEntry(entry);
|
||||||
}
|
}
|
||||||
|
player.sendPacket(new ExPledgeMissionRewardCount(player));
|
||||||
|
player.sendPacket(new ExPledgeMissionInfo(player));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -82,6 +82,8 @@ import org.l2jmobius.gameserver.network.serverpackets.PledgeSkillListAdd;
|
|||||||
import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
|
import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
|
||||||
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
|
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
|
||||||
import org.l2jmobius.gameserver.network.serverpackets.UserInfo;
|
import org.l2jmobius.gameserver.network.serverpackets.UserInfo;
|
||||||
|
import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeMissionInfo;
|
||||||
|
import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeMissionRewardCount;
|
||||||
import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeShowInfoUpdate;
|
import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeShowInfoUpdate;
|
||||||
import org.l2jmobius.gameserver.util.EnumIntBitmask;
|
import org.l2jmobius.gameserver.util.EnumIntBitmask;
|
||||||
import org.l2jmobius.gameserver.util.Util;
|
import org.l2jmobius.gameserver.util.Util;
|
||||||
@@ -394,6 +396,8 @@ public class Clan implements IIdentifiable, INamable
|
|||||||
player.setPledgeClass(PLEDGE_CLASS_COMMON);
|
player.setPledgeClass(PLEDGE_CLASS_COMMON);
|
||||||
player.sendPacket(new PledgeShowMemberListUpdate(player));
|
player.sendPacket(new PledgeShowMemberListUpdate(player));
|
||||||
player.sendPacket(new PledgeSkillList(this));
|
player.sendPacket(new PledgeSkillList(this));
|
||||||
|
player.sendPacket(new ExPledgeMissionRewardCount(player));
|
||||||
|
player.sendPacket(new ExPledgeMissionInfo(player));
|
||||||
addSkillEffects(player);
|
addSkillEffects(player);
|
||||||
|
|
||||||
// Notify to scripts
|
// Notify to scripts
|
||||||
|
@@ -55,15 +55,19 @@ public class ExPledgeMissionInfo extends ServerPacket
|
|||||||
// TODO: Figure out this.
|
// TODO: Figure out this.
|
||||||
if (reward.isLevelUpMission())
|
if (reward.isLevelUpMission())
|
||||||
{
|
{
|
||||||
progress = 1;
|
|
||||||
if (status == 2)
|
if (status == 2)
|
||||||
{
|
{
|
||||||
status = reward.getRequiredCompletions() > _player.getLevel() ? 1 : 3;
|
status = reward.getRequiredCompletions() > _player.getLevel() ? 1 : 3;
|
||||||
}
|
}
|
||||||
|
else if ((status == 3) && (progress == 3))
|
||||||
|
{
|
||||||
|
status = 0;
|
||||||
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
status = reward.isRecentlyCompleted(_player) ? 0 : 3;
|
status = reward.isRecentlyCompleted(_player) ? 0 : 3;
|
||||||
}
|
}
|
||||||
|
progress = 1;
|
||||||
}
|
}
|
||||||
else if (status == 1)
|
else if (status == 1)
|
||||||
{
|
{
|
||||||
|
@@ -25,6 +25,8 @@ import org.l2jmobius.gameserver.model.events.Containers;
|
|||||||
import org.l2jmobius.gameserver.model.events.EventType;
|
import org.l2jmobius.gameserver.model.events.EventType;
|
||||||
import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLevelChanged;
|
import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLevelChanged;
|
||||||
import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener;
|
import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener;
|
||||||
|
import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeMissionInfo;
|
||||||
|
import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeMissionRewardCount;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author Sdw
|
* @author Sdw
|
||||||
@@ -94,6 +96,11 @@ public class LevelDailyMissionHandler extends AbstractDailyMissionHandler
|
|||||||
private void onPlayerLevelChanged(OnPlayerLevelChanged event)
|
private void onPlayerLevelChanged(OnPlayerLevelChanged event)
|
||||||
{
|
{
|
||||||
final Player player = event.getPlayer();
|
final Player player = event.getPlayer();
|
||||||
|
if (player.getClan() == null)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
if ((player.getLevel() >= _level) && (player.isDualClassActive() == _dualclass))
|
if ((player.getLevel() >= _level) && (player.isDualClassActive() == _dualclass))
|
||||||
{
|
{
|
||||||
final DailyMissionPlayerEntry entry = getPlayerEntry(player.getObjectId(), true);
|
final DailyMissionPlayerEntry entry = getPlayerEntry(player.getObjectId(), true);
|
||||||
@@ -102,6 +109,8 @@ public class LevelDailyMissionHandler extends AbstractDailyMissionHandler
|
|||||||
entry.setStatus(DailyMissionStatus.AVAILABLE);
|
entry.setStatus(DailyMissionStatus.AVAILABLE);
|
||||||
storePlayerEntry(entry);
|
storePlayerEntry(entry);
|
||||||
}
|
}
|
||||||
|
player.sendPacket(new ExPledgeMissionRewardCount(player));
|
||||||
|
player.sendPacket(new ExPledgeMissionInfo(player));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -82,6 +82,8 @@ import org.l2jmobius.gameserver.network.serverpackets.PledgeSkillListAdd;
|
|||||||
import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
|
import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
|
||||||
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
|
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
|
||||||
import org.l2jmobius.gameserver.network.serverpackets.UserInfo;
|
import org.l2jmobius.gameserver.network.serverpackets.UserInfo;
|
||||||
|
import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeMissionInfo;
|
||||||
|
import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeMissionRewardCount;
|
||||||
import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeShowInfoUpdate;
|
import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeShowInfoUpdate;
|
||||||
import org.l2jmobius.gameserver.util.EnumIntBitmask;
|
import org.l2jmobius.gameserver.util.EnumIntBitmask;
|
||||||
import org.l2jmobius.gameserver.util.Util;
|
import org.l2jmobius.gameserver.util.Util;
|
||||||
@@ -394,6 +396,8 @@ public class Clan implements IIdentifiable, INamable
|
|||||||
player.setPledgeClass(PLEDGE_CLASS_COMMON);
|
player.setPledgeClass(PLEDGE_CLASS_COMMON);
|
||||||
player.sendPacket(new PledgeShowMemberListUpdate(player));
|
player.sendPacket(new PledgeShowMemberListUpdate(player));
|
||||||
player.sendPacket(new PledgeSkillList(this));
|
player.sendPacket(new PledgeSkillList(this));
|
||||||
|
player.sendPacket(new ExPledgeMissionRewardCount(player));
|
||||||
|
player.sendPacket(new ExPledgeMissionInfo(player));
|
||||||
addSkillEffects(player);
|
addSkillEffects(player);
|
||||||
|
|
||||||
// Notify to scripts
|
// Notify to scripts
|
||||||
|
@@ -55,15 +55,19 @@ public class ExPledgeMissionInfo extends ServerPacket
|
|||||||
// TODO: Figure out this.
|
// TODO: Figure out this.
|
||||||
if (reward.isLevelUpMission())
|
if (reward.isLevelUpMission())
|
||||||
{
|
{
|
||||||
progress = 1;
|
|
||||||
if (status == 2)
|
if (status == 2)
|
||||||
{
|
{
|
||||||
status = reward.getRequiredCompletions() > _player.getLevel() ? 1 : 3;
|
status = reward.getRequiredCompletions() > _player.getLevel() ? 1 : 3;
|
||||||
}
|
}
|
||||||
|
else if ((status == 3) && (progress == 3))
|
||||||
|
{
|
||||||
|
status = 0;
|
||||||
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
status = reward.isRecentlyCompleted(_player) ? 0 : 3;
|
status = reward.isRecentlyCompleted(_player) ? 0 : 3;
|
||||||
}
|
}
|
||||||
|
progress = 1;
|
||||||
}
|
}
|
||||||
else if (status == 1)
|
else if (status == 1)
|
||||||
{
|
{
|
||||||
|
@@ -25,6 +25,8 @@ import org.l2jmobius.gameserver.model.events.Containers;
|
|||||||
import org.l2jmobius.gameserver.model.events.EventType;
|
import org.l2jmobius.gameserver.model.events.EventType;
|
||||||
import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLevelChanged;
|
import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLevelChanged;
|
||||||
import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener;
|
import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener;
|
||||||
|
import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeMissionInfo;
|
||||||
|
import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeMissionRewardCount;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author Sdw
|
* @author Sdw
|
||||||
@@ -94,6 +96,11 @@ public class LevelDailyMissionHandler extends AbstractDailyMissionHandler
|
|||||||
private void onPlayerLevelChanged(OnPlayerLevelChanged event)
|
private void onPlayerLevelChanged(OnPlayerLevelChanged event)
|
||||||
{
|
{
|
||||||
final Player player = event.getPlayer();
|
final Player player = event.getPlayer();
|
||||||
|
if (player.getClan() == null)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
if ((player.getLevel() >= _level) && (player.isDualClassActive() == _dualclass))
|
if ((player.getLevel() >= _level) && (player.isDualClassActive() == _dualclass))
|
||||||
{
|
{
|
||||||
final DailyMissionPlayerEntry entry = getPlayerEntry(player.getObjectId(), true);
|
final DailyMissionPlayerEntry entry = getPlayerEntry(player.getObjectId(), true);
|
||||||
@@ -102,6 +109,8 @@ public class LevelDailyMissionHandler extends AbstractDailyMissionHandler
|
|||||||
entry.setStatus(DailyMissionStatus.AVAILABLE);
|
entry.setStatus(DailyMissionStatus.AVAILABLE);
|
||||||
storePlayerEntry(entry);
|
storePlayerEntry(entry);
|
||||||
}
|
}
|
||||||
|
player.sendPacket(new ExPledgeMissionRewardCount(player));
|
||||||
|
player.sendPacket(new ExPledgeMissionInfo(player));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -82,6 +82,8 @@ import org.l2jmobius.gameserver.network.serverpackets.PledgeSkillListAdd;
|
|||||||
import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
|
import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
|
||||||
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
|
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
|
||||||
import org.l2jmobius.gameserver.network.serverpackets.UserInfo;
|
import org.l2jmobius.gameserver.network.serverpackets.UserInfo;
|
||||||
|
import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeMissionInfo;
|
||||||
|
import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeMissionRewardCount;
|
||||||
import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeShowInfoUpdate;
|
import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeShowInfoUpdate;
|
||||||
import org.l2jmobius.gameserver.util.EnumIntBitmask;
|
import org.l2jmobius.gameserver.util.EnumIntBitmask;
|
||||||
import org.l2jmobius.gameserver.util.Util;
|
import org.l2jmobius.gameserver.util.Util;
|
||||||
@@ -394,6 +396,8 @@ public class Clan implements IIdentifiable, INamable
|
|||||||
player.setPledgeClass(PLEDGE_CLASS_COMMON);
|
player.setPledgeClass(PLEDGE_CLASS_COMMON);
|
||||||
player.sendPacket(new PledgeShowMemberListUpdate(player));
|
player.sendPacket(new PledgeShowMemberListUpdate(player));
|
||||||
player.sendPacket(new PledgeSkillList(this));
|
player.sendPacket(new PledgeSkillList(this));
|
||||||
|
player.sendPacket(new ExPledgeMissionRewardCount(player));
|
||||||
|
player.sendPacket(new ExPledgeMissionInfo(player));
|
||||||
addSkillEffects(player);
|
addSkillEffects(player);
|
||||||
|
|
||||||
// Notify to scripts
|
// Notify to scripts
|
||||||
|
@@ -55,15 +55,19 @@ public class ExPledgeMissionInfo extends ServerPacket
|
|||||||
// TODO: Figure out this.
|
// TODO: Figure out this.
|
||||||
if (reward.isLevelUpMission())
|
if (reward.isLevelUpMission())
|
||||||
{
|
{
|
||||||
progress = 1;
|
|
||||||
if (status == 2)
|
if (status == 2)
|
||||||
{
|
{
|
||||||
status = reward.getRequiredCompletions() > _player.getLevel() ? 1 : 3;
|
status = reward.getRequiredCompletions() > _player.getLevel() ? 1 : 3;
|
||||||
}
|
}
|
||||||
|
else if ((status == 3) && (progress == 3))
|
||||||
|
{
|
||||||
|
status = 0;
|
||||||
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
status = reward.isRecentlyCompleted(_player) ? 0 : 3;
|
status = reward.isRecentlyCompleted(_player) ? 0 : 3;
|
||||||
}
|
}
|
||||||
|
progress = 1;
|
||||||
}
|
}
|
||||||
else if (status == 1)
|
else if (status == 1)
|
||||||
{
|
{
|
||||||
|
@@ -25,6 +25,8 @@ import org.l2jmobius.gameserver.model.events.Containers;
|
|||||||
import org.l2jmobius.gameserver.model.events.EventType;
|
import org.l2jmobius.gameserver.model.events.EventType;
|
||||||
import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLevelChanged;
|
import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLevelChanged;
|
||||||
import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener;
|
import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener;
|
||||||
|
import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeMissionInfo;
|
||||||
|
import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeMissionRewardCount;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author Sdw
|
* @author Sdw
|
||||||
@@ -94,6 +96,11 @@ public class LevelDailyMissionHandler extends AbstractDailyMissionHandler
|
|||||||
private void onPlayerLevelChanged(OnPlayerLevelChanged event)
|
private void onPlayerLevelChanged(OnPlayerLevelChanged event)
|
||||||
{
|
{
|
||||||
final Player player = event.getPlayer();
|
final Player player = event.getPlayer();
|
||||||
|
if (player.getClan() == null)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
if ((player.getLevel() >= _level) && (player.isDualClassActive() == _dualclass))
|
if ((player.getLevel() >= _level) && (player.isDualClassActive() == _dualclass))
|
||||||
{
|
{
|
||||||
final DailyMissionPlayerEntry entry = getPlayerEntry(player.getObjectId(), true);
|
final DailyMissionPlayerEntry entry = getPlayerEntry(player.getObjectId(), true);
|
||||||
@@ -102,6 +109,8 @@ public class LevelDailyMissionHandler extends AbstractDailyMissionHandler
|
|||||||
entry.setStatus(DailyMissionStatus.AVAILABLE);
|
entry.setStatus(DailyMissionStatus.AVAILABLE);
|
||||||
storePlayerEntry(entry);
|
storePlayerEntry(entry);
|
||||||
}
|
}
|
||||||
|
player.sendPacket(new ExPledgeMissionRewardCount(player));
|
||||||
|
player.sendPacket(new ExPledgeMissionInfo(player));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -82,6 +82,8 @@ import org.l2jmobius.gameserver.network.serverpackets.PledgeSkillListAdd;
|
|||||||
import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
|
import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
|
||||||
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
|
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
|
||||||
import org.l2jmobius.gameserver.network.serverpackets.UserInfo;
|
import org.l2jmobius.gameserver.network.serverpackets.UserInfo;
|
||||||
|
import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeMissionInfo;
|
||||||
|
import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeMissionRewardCount;
|
||||||
import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeShowInfoUpdate;
|
import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeShowInfoUpdate;
|
||||||
import org.l2jmobius.gameserver.util.EnumIntBitmask;
|
import org.l2jmobius.gameserver.util.EnumIntBitmask;
|
||||||
import org.l2jmobius.gameserver.util.Util;
|
import org.l2jmobius.gameserver.util.Util;
|
||||||
@@ -394,6 +396,8 @@ public class Clan implements IIdentifiable, INamable
|
|||||||
player.setPledgeClass(PLEDGE_CLASS_COMMON);
|
player.setPledgeClass(PLEDGE_CLASS_COMMON);
|
||||||
player.sendPacket(new PledgeShowMemberListUpdate(player));
|
player.sendPacket(new PledgeShowMemberListUpdate(player));
|
||||||
player.sendPacket(new PledgeSkillList(this));
|
player.sendPacket(new PledgeSkillList(this));
|
||||||
|
player.sendPacket(new ExPledgeMissionRewardCount(player));
|
||||||
|
player.sendPacket(new ExPledgeMissionInfo(player));
|
||||||
addSkillEffects(player);
|
addSkillEffects(player);
|
||||||
|
|
||||||
// Notify to scripts
|
// Notify to scripts
|
||||||
|
@@ -55,15 +55,19 @@ public class ExPledgeMissionInfo extends ServerPacket
|
|||||||
// TODO: Figure out this.
|
// TODO: Figure out this.
|
||||||
if (reward.isLevelUpMission())
|
if (reward.isLevelUpMission())
|
||||||
{
|
{
|
||||||
progress = 1;
|
|
||||||
if (status == 2)
|
if (status == 2)
|
||||||
{
|
{
|
||||||
status = reward.getRequiredCompletions() > _player.getLevel() ? 1 : 3;
|
status = reward.getRequiredCompletions() > _player.getLevel() ? 1 : 3;
|
||||||
}
|
}
|
||||||
|
else if ((status == 3) && (progress == 3))
|
||||||
|
{
|
||||||
|
status = 0;
|
||||||
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
status = reward.isRecentlyCompleted(_player) ? 0 : 3;
|
status = reward.isRecentlyCompleted(_player) ? 0 : 3;
|
||||||
}
|
}
|
||||||
|
progress = 1;
|
||||||
}
|
}
|
||||||
else if (status == 1)
|
else if (status == 1)
|
||||||
{
|
{
|
||||||
|
@@ -25,6 +25,8 @@ import org.l2jmobius.gameserver.model.events.Containers;
|
|||||||
import org.l2jmobius.gameserver.model.events.EventType;
|
import org.l2jmobius.gameserver.model.events.EventType;
|
||||||
import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLevelChanged;
|
import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLevelChanged;
|
||||||
import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener;
|
import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener;
|
||||||
|
import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeMissionInfo;
|
||||||
|
import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeMissionRewardCount;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author Sdw
|
* @author Sdw
|
||||||
@@ -94,6 +96,11 @@ public class LevelDailyMissionHandler extends AbstractDailyMissionHandler
|
|||||||
private void onPlayerLevelChanged(OnPlayerLevelChanged event)
|
private void onPlayerLevelChanged(OnPlayerLevelChanged event)
|
||||||
{
|
{
|
||||||
final Player player = event.getPlayer();
|
final Player player = event.getPlayer();
|
||||||
|
if (player.getClan() == null)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
if ((player.getLevel() >= _level) && (player.isDualClassActive() == _dualclass))
|
if ((player.getLevel() >= _level) && (player.isDualClassActive() == _dualclass))
|
||||||
{
|
{
|
||||||
final DailyMissionPlayerEntry entry = getPlayerEntry(player.getObjectId(), true);
|
final DailyMissionPlayerEntry entry = getPlayerEntry(player.getObjectId(), true);
|
||||||
@@ -102,6 +109,8 @@ public class LevelDailyMissionHandler extends AbstractDailyMissionHandler
|
|||||||
entry.setStatus(DailyMissionStatus.AVAILABLE);
|
entry.setStatus(DailyMissionStatus.AVAILABLE);
|
||||||
storePlayerEntry(entry);
|
storePlayerEntry(entry);
|
||||||
}
|
}
|
||||||
|
player.sendPacket(new ExPledgeMissionRewardCount(player));
|
||||||
|
player.sendPacket(new ExPledgeMissionInfo(player));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -82,6 +82,8 @@ import org.l2jmobius.gameserver.network.serverpackets.PledgeSkillListAdd;
|
|||||||
import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
|
import org.l2jmobius.gameserver.network.serverpackets.ServerPacket;
|
||||||
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
|
import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
|
||||||
import org.l2jmobius.gameserver.network.serverpackets.UserInfo;
|
import org.l2jmobius.gameserver.network.serverpackets.UserInfo;
|
||||||
|
import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeMissionInfo;
|
||||||
|
import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeMissionRewardCount;
|
||||||
import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeShowInfoUpdate;
|
import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeShowInfoUpdate;
|
||||||
import org.l2jmobius.gameserver.util.EnumIntBitmask;
|
import org.l2jmobius.gameserver.util.EnumIntBitmask;
|
||||||
import org.l2jmobius.gameserver.util.Util;
|
import org.l2jmobius.gameserver.util.Util;
|
||||||
@@ -394,6 +396,8 @@ public class Clan implements IIdentifiable, INamable
|
|||||||
player.setPledgeClass(PLEDGE_CLASS_COMMON);
|
player.setPledgeClass(PLEDGE_CLASS_COMMON);
|
||||||
player.sendPacket(new PledgeShowMemberListUpdate(player));
|
player.sendPacket(new PledgeShowMemberListUpdate(player));
|
||||||
player.sendPacket(new PledgeSkillList(this));
|
player.sendPacket(new PledgeSkillList(this));
|
||||||
|
player.sendPacket(new ExPledgeMissionRewardCount(player));
|
||||||
|
player.sendPacket(new ExPledgeMissionInfo(player));
|
||||||
addSkillEffects(player);
|
addSkillEffects(player);
|
||||||
|
|
||||||
// Notify to scripts
|
// Notify to scripts
|
||||||
|
@@ -55,15 +55,19 @@ public class ExPledgeMissionInfo extends ServerPacket
|
|||||||
// TODO: Figure out this.
|
// TODO: Figure out this.
|
||||||
if (reward.isLevelUpMission())
|
if (reward.isLevelUpMission())
|
||||||
{
|
{
|
||||||
progress = 1;
|
|
||||||
if (status == 2)
|
if (status == 2)
|
||||||
{
|
{
|
||||||
status = reward.getRequiredCompletions() > _player.getLevel() ? 1 : 3;
|
status = reward.getRequiredCompletions() > _player.getLevel() ? 1 : 3;
|
||||||
}
|
}
|
||||||
|
else if ((status == 3) && (progress == 3))
|
||||||
|
{
|
||||||
|
status = 0;
|
||||||
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
status = reward.isRecentlyCompleted(_player) ? 0 : 3;
|
status = reward.isRecentlyCompleted(_player) ? 0 : 3;
|
||||||
}
|
}
|
||||||
|
progress = 1;
|
||||||
}
|
}
|
||||||
else if (status == 1)
|
else if (status == 1)
|
||||||
{
|
{
|
||||||
|
Reference in New Issue
Block a user