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

Completed the Daily Mission refactoring.

Browse Source
This commit is contained in:
MobiusDev
2016-06-22 17:59:06 +00:00
parent 2f84c5a864
commit e30ee3af6c
24 changed files with 242 additions and 242 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
trunk/dist/game/data/scripts/handlers/DailyMissionMasterHandler.java vendored Normal file
View File

@@ -0,0 +1,51 @@
/*
* This file is part of the L2J Mobius project.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package handlers;
import java.util.logging.Logger;
import com.l2jmobius.gameserver.handler.DailyMissionHandler;
import handlers.dailymissionhandlers.BossDailyMissionHandler;
import handlers.dailymissionhandlers.CeremonyOfChaosDailyMissionHandler;
import handlers.dailymissionhandlers.FishingDailyMissionHandler;
import handlers.dailymissionhandlers.LevelDailyMissionHandler;
import handlers.dailymissionhandlers.OlympiadDailyMissionHandler;
import handlers.dailymissionhandlers.QuestDailyMissionHandler;
import handlers.dailymissionhandlers.SiegeDailyMissionHandler;
/**
* @author UnAfraid
*/
public class DailyMissionMasterHandler
{
private static final Logger LOGGER = Logger.getLogger(DailyMissionMasterHandler.class.getName());
public static void main(String[] args)
{
DailyMissionHandler.getInstance().registerHandler("level", LevelDailyMissionHandler::new);
// DailyMissionHandler.getInstance().registerHandler("loginAllWeek", LoginAllWeekDailyMissionHandler::new);
// DailyMissionHandler.getInstance().registerHandler("loginAllMonth", LoginAllWeekDailyMissionHandler::new);
DailyMissionHandler.getInstance().registerHandler("quest", QuestDailyMissionHandler::new);
DailyMissionHandler.getInstance().registerHandler("olympiad", OlympiadDailyMissionHandler::new);
DailyMissionHandler.getInstance().registerHandler("siege", SiegeDailyMissionHandler::new);
DailyMissionHandler.getInstance().registerHandler("ceremonyofchaos", CeremonyOfChaosDailyMissionHandler::new);
DailyMissionHandler.getInstance().registerHandler("boss", BossDailyMissionHandler::new);
DailyMissionHandler.getInstance().registerHandler("fishing", FishingDailyMissionHandler::new);
LOGGER.info(DailyMissionMasterHandler.class.getSimpleName() + ": Loaded " + DailyMissionHandler.getInstance().size() + " handlers.");
}
}

51
trunk/dist/game/data/scripts/handlers/OneDayRewardMasterHandler.java vendored
View File

@@ -1,51 +0,0 @@
/*
* This file is part of the L2J Mobius project.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package handlers;
import java.util.logging.Logger;
import com.l2jmobius.gameserver.handler.OneDayRewardHandler;
import handlers.onedayrewardshandlers.BossOneDayRewardHandler;
import handlers.onedayrewardshandlers.CeremonyOfChaosOneDayRewardHandler;
import handlers.onedayrewardshandlers.FishingOneDayRewardHandler;
import handlers.onedayrewardshandlers.LevelOneDayRewardHandler;
import handlers.onedayrewardshandlers.OlympiadOneDayRewardHandler;
import handlers.onedayrewardshandlers.QuestOneDayRewardHandler;
import handlers.onedayrewardshandlers.SiegeOneDayRewardHandler;
/**
* @author UnAfraid
*/
public class OneDayRewardMasterHandler
{
private static final Logger LOGGER = Logger.getLogger(OneDayRewardMasterHandler.class.getName());
public static void main(String[] args)
{
OneDayRewardHandler.getInstance().registerHandler("level", LevelOneDayRewardHandler::new);
// OneDayRewardHandler.getInstance().registerHandler("loginAllWeek", LoginAllWeekOneDayRewardHandler::new);
// OneDayRewardHandler.getInstance().registerHandler("loginAllMonth", LoginAllWeekOneDayRewardHandler::new);
OneDayRewardHandler.getInstance().registerHandler("quest", QuestOneDayRewardHandler::new);
OneDayRewardHandler.getInstance().registerHandler("olympiad", OlympiadOneDayRewardHandler::new);
OneDayRewardHandler.getInstance().registerHandler("siege", SiegeOneDayRewardHandler::new);
OneDayRewardHandler.getInstance().registerHandler("ceremonyofchaos", CeremonyOfChaosOneDayRewardHandler::new);
OneDayRewardHandler.getInstance().registerHandler("boss", BossOneDayRewardHandler::new);
OneDayRewardHandler.getInstance().registerHandler("fishing", FishingOneDayRewardHandler::new);
LOGGER.info(OneDayRewardMasterHandler.class.getSimpleName() + ": Loaded " + OneDayRewardHandler.getInstance().size() + " handlers.");
}
}

24
trunk/dist/game/data/scripts/handlers/onedayrewardshandlers/BossOneDayRewardHandler.java → trunk/dist/game/data/scripts/handlers/dailymissionhandlers/BossDailyMissionHandler.java vendored
View File

@@ -14,17 +14,17 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package handlers.onedayrewardshandlers;
package handlers.dailymissionhandlers;
import java.util.List;
import com.l2jmobius.Config;
import com.l2jmobius.gameserver.enums.OneDayRewardStatus;
import com.l2jmobius.gameserver.handler.AbstractOneDayRewardHandler;
import com.l2jmobius.gameserver.enums.DailyMissionStatus;
import com.l2jmobius.gameserver.handler.AbstractDailyMissionHandler;
import com.l2jmobius.gameserver.model.DailyMissionDataHolder;
import com.l2jmobius.gameserver.model.DailyMissionPlayerEntry;
import com.l2jmobius.gameserver.model.L2CommandChannel;
import com.l2jmobius.gameserver.model.L2Party;
import com.l2jmobius.gameserver.model.OneDayRewardDataHolder;
import com.l2jmobius.gameserver.model.OneDayRewardPlayerEntry;
import com.l2jmobius.gameserver.model.actor.L2Attackable;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.events.Containers;
@@ -35,11 +35,11 @@ import com.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener;
/**
* @author UnAfraid
*/
public class BossOneDayRewardHandler extends AbstractOneDayRewardHandler
public class BossDailyMissionHandler extends AbstractDailyMissionHandler
{
private final int _amount;
public BossOneDayRewardHandler(OneDayRewardDataHolder holder)
public BossDailyMissionHandler(DailyMissionDataHolder holder)
{
super(holder);
_amount = holder.getRequiredCompletions();
@@ -54,7 +54,7 @@ public class BossOneDayRewardHandler extends AbstractOneDayRewardHandler
@Override
public boolean isAvailable(L2PcInstance player)
{
final OneDayRewardPlayerEntry entry = getPlayerEntry(player.getObjectId(), false);
final DailyMissionPlayerEntry entry = getPlayerEntry(player.getObjectId(), false);
if (entry != null)
{
switch (entry.getStatus())
@@ -63,7 +63,7 @@ public class BossOneDayRewardHandler extends AbstractOneDayRewardHandler
{
if (entry.getProgress() >= _amount)
{
entry.setStatus(OneDayRewardStatus.AVAILABLE);
entry.setStatus(DailyMissionStatus.AVAILABLE);
storePlayerEntry(entry);
}
break;
@@ -99,12 +99,12 @@ public class BossOneDayRewardHandler extends AbstractOneDayRewardHandler
private void processPlayerProgress(L2PcInstance player)
{
final OneDayRewardPlayerEntry entry = getPlayerEntry(player.getObjectId(), true);
if (entry.getStatus() == OneDayRewardStatus.NOT_AVAILABLE)
final DailyMissionPlayerEntry entry = getPlayerEntry(player.getObjectId(), true);
if (entry.getStatus() == DailyMissionStatus.NOT_AVAILABLE)
{
if (entry.increaseProgress() >= _amount)
{
entry.setStatus(OneDayRewardStatus.AVAILABLE);
entry.setStatus(DailyMissionStatus.AVAILABLE);
}
storePlayerEntry(entry);
}

24
trunk/dist/game/data/scripts/handlers/onedayrewardshandlers/CeremonyOfChaosOneDayRewardHandler.java → trunk/dist/game/data/scripts/handlers/dailymissionhandlers/CeremonyOfChaosDailyMissionHandler.java vendored
View File

@@ -14,12 +14,12 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package handlers.onedayrewardshandlers;
package handlers.dailymissionhandlers;
import com.l2jmobius.gameserver.enums.OneDayRewardStatus;
import com.l2jmobius.gameserver.handler.AbstractOneDayRewardHandler;
import com.l2jmobius.gameserver.model.OneDayRewardDataHolder;
import com.l2jmobius.gameserver.model.OneDayRewardPlayerEntry;
import com.l2jmobius.gameserver.enums.DailyMissionStatus;
import com.l2jmobius.gameserver.handler.AbstractDailyMissionHandler;
import com.l2jmobius.gameserver.model.DailyMissionDataHolder;
import com.l2jmobius.gameserver.model.DailyMissionPlayerEntry;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.events.Containers;
import com.l2jmobius.gameserver.model.events.EventType;
@@ -29,11 +29,11 @@ import com.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener;
/**
* @author UnAfraid
*/
public class CeremonyOfChaosOneDayRewardHandler extends AbstractOneDayRewardHandler
public class CeremonyOfChaosDailyMissionHandler extends AbstractDailyMissionHandler
{
private final int _amount;
public CeremonyOfChaosOneDayRewardHandler(OneDayRewardDataHolder holder)
public CeremonyOfChaosDailyMissionHandler(DailyMissionDataHolder holder)
{
super(holder);
_amount = holder.getRequiredCompletions();
@@ -48,7 +48,7 @@ public class CeremonyOfChaosOneDayRewardHandler extends AbstractOneDayRewardHand
@Override
public boolean isAvailable(L2PcInstance player)
{
final OneDayRewardPlayerEntry entry = getPlayerEntry(player.getObjectId(), false);
final DailyMissionPlayerEntry entry = getPlayerEntry(player.getObjectId(), false);
if (entry != null)
{
switch (entry.getStatus())
@@ -57,7 +57,7 @@ public class CeremonyOfChaosOneDayRewardHandler extends AbstractOneDayRewardHand
{
if (entry.getProgress() >= _amount)
{
entry.setStatus(OneDayRewardStatus.AVAILABLE);
entry.setStatus(DailyMissionStatus.AVAILABLE);
storePlayerEntry(entry);
}
break;
@@ -75,12 +75,12 @@ public class CeremonyOfChaosOneDayRewardHandler extends AbstractOneDayRewardHand
{
event.getMembers().forEach(member ->
{
final OneDayRewardPlayerEntry entry = getPlayerEntry(member.getObjectId(), true);
if (entry.getStatus() == OneDayRewardStatus.NOT_AVAILABLE)
final DailyMissionPlayerEntry entry = getPlayerEntry(member.getObjectId(), true);
if (entry.getStatus() == DailyMissionStatus.NOT_AVAILABLE)
{
if (entry.increaseProgress() >= _amount)
{
entry.setStatus(OneDayRewardStatus.AVAILABLE);
entry.setStatus(DailyMissionStatus.AVAILABLE);
}
storePlayerEntry(entry);
}

24
trunk/dist/game/data/scripts/handlers/onedayrewardshandlers/FishingOneDayRewardHandler.java → trunk/dist/game/data/scripts/handlers/dailymissionhandlers/FishingDailyMissionHandler.java vendored
View File

@@ -14,12 +14,12 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package handlers.onedayrewardshandlers;
package handlers.dailymissionhandlers;
import com.l2jmobius.gameserver.enums.OneDayRewardStatus;
import com.l2jmobius.gameserver.handler.AbstractOneDayRewardHandler;
import com.l2jmobius.gameserver.model.OneDayRewardDataHolder;
import com.l2jmobius.gameserver.model.OneDayRewardPlayerEntry;
import com.l2jmobius.gameserver.enums.DailyMissionStatus;
import com.l2jmobius.gameserver.handler.AbstractDailyMissionHandler;
import com.l2jmobius.gameserver.model.DailyMissionDataHolder;
import com.l2jmobius.gameserver.model.DailyMissionPlayerEntry;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.events.Containers;
import com.l2jmobius.gameserver.model.events.EventType;
@@ -30,11 +30,11 @@ import com.l2jmobius.gameserver.network.serverpackets.fishing.ExFishingEnd.Fishi
/**
* @author UnAfraid
*/
public class FishingOneDayRewardHandler extends AbstractOneDayRewardHandler
public class FishingDailyMissionHandler extends AbstractDailyMissionHandler
{
private final int _amount;
public FishingOneDayRewardHandler(OneDayRewardDataHolder holder)
public FishingDailyMissionHandler(DailyMissionDataHolder holder)
{
super(holder);
_amount = holder.getRequiredCompletions();
@@ -49,7 +49,7 @@ public class FishingOneDayRewardHandler extends AbstractOneDayRewardHandler
@Override
public boolean isAvailable(L2PcInstance player)
{
final OneDayRewardPlayerEntry entry = getPlayerEntry(player.getObjectId(), false);
final DailyMissionPlayerEntry entry = getPlayerEntry(player.getObjectId(), false);
if (entry != null)
{
switch (entry.getStatus())
@@ -58,7 +58,7 @@ public class FishingOneDayRewardHandler extends AbstractOneDayRewardHandler
{
if (entry.getProgress() >= _amount)
{
entry.setStatus(OneDayRewardStatus.AVAILABLE);
entry.setStatus(DailyMissionStatus.AVAILABLE);
storePlayerEntry(entry);
}
break;
@@ -77,12 +77,12 @@ public class FishingOneDayRewardHandler extends AbstractOneDayRewardHandler
final L2PcInstance player = event.getActiveChar();
if (event.getReason() == FishingEndReason.WIN)
{
final OneDayRewardPlayerEntry entry = getPlayerEntry(player.getObjectId(), true);
if (entry.getStatus() == OneDayRewardStatus.NOT_AVAILABLE)
final DailyMissionPlayerEntry entry = getPlayerEntry(player.getObjectId(), true);
if (entry.getStatus() == DailyMissionStatus.NOT_AVAILABLE)
{
if (entry.increaseProgress() >= _amount)
{
entry.setStatus(OneDayRewardStatus.AVAILABLE);
entry.setStatus(DailyMissionStatus.AVAILABLE);
}
storePlayerEntry(entry);
}

24
trunk/dist/game/data/scripts/handlers/onedayrewardshandlers/LevelOneDayRewardHandler.java → trunk/dist/game/data/scripts/handlers/dailymissionhandlers/LevelDailyMissionHandler.java vendored
View File

@@ -14,12 +14,12 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package handlers.onedayrewardshandlers;
package handlers.dailymissionhandlers;
import com.l2jmobius.gameserver.enums.OneDayRewardStatus;
import com.l2jmobius.gameserver.handler.AbstractOneDayRewardHandler;
import com.l2jmobius.gameserver.model.OneDayRewardDataHolder;
import com.l2jmobius.gameserver.model.OneDayRewardPlayerEntry;
import com.l2jmobius.gameserver.enums.DailyMissionStatus;
import com.l2jmobius.gameserver.handler.AbstractDailyMissionHandler;
import com.l2jmobius.gameserver.model.DailyMissionDataHolder;
import com.l2jmobius.gameserver.model.DailyMissionPlayerEntry;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.events.Containers;
import com.l2jmobius.gameserver.model.events.EventType;
@@ -29,12 +29,12 @@ import com.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener;
/**
* @author Sdw
*/
public class LevelOneDayRewardHandler extends AbstractOneDayRewardHandler
public class LevelDailyMissionHandler extends AbstractDailyMissionHandler
{
private final int _level;
private final boolean _dualclass;
public LevelOneDayRewardHandler(OneDayRewardDataHolder holder)
public LevelDailyMissionHandler(DailyMissionDataHolder holder)
{
super(holder);
_level = holder.getParams().getInt("level");
@@ -50,7 +50,7 @@ public class LevelOneDayRewardHandler extends AbstractOneDayRewardHandler
@Override
public boolean isAvailable(L2PcInstance player)
{
final OneDayRewardPlayerEntry entry = getPlayerEntry(player.getObjectId(), false);
final DailyMissionPlayerEntry entry = getPlayerEntry(player.getObjectId(), false);
if (entry != null)
{
switch (entry.getStatus())
@@ -59,7 +59,7 @@ public class LevelOneDayRewardHandler extends AbstractOneDayRewardHandler
{
if ((player.getLevel() >= _level) && (player.isDualClassActive() == _dualclass))
{
entry.setStatus(OneDayRewardStatus.AVAILABLE);
entry.setStatus(DailyMissionStatus.AVAILABLE);
storePlayerEntry(entry);
}
break;
@@ -84,10 +84,10 @@ public class LevelOneDayRewardHandler extends AbstractOneDayRewardHandler
final L2PcInstance player = event.getActiveChar();
if ((player.getLevel() >= _level) && (player.isDualClassActive() == _dualclass))
{
final OneDayRewardPlayerEntry entry = getPlayerEntry(player.getObjectId(), true);
if (entry.getStatus() == OneDayRewardStatus.NOT_AVAILABLE)
final DailyMissionPlayerEntry entry = getPlayerEntry(player.getObjectId(), true);
if (entry.getStatus() == DailyMissionStatus.NOT_AVAILABLE)
{
entry.setStatus(OneDayRewardStatus.AVAILABLE);
entry.setStatus(DailyMissionStatus.AVAILABLE);
storePlayerEntry(entry);
}
}

30
trunk/dist/game/data/scripts/handlers/onedayrewardshandlers/OlympiadOneDayRewardHandler.java → trunk/dist/game/data/scripts/handlers/dailymissionhandlers/OlympiadDailyMissionHandler.java vendored
View File

@@ -14,12 +14,12 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package handlers.onedayrewardshandlers;
package handlers.dailymissionhandlers;
import com.l2jmobius.gameserver.enums.OneDayRewardStatus;
import com.l2jmobius.gameserver.handler.AbstractOneDayRewardHandler;
import com.l2jmobius.gameserver.model.OneDayRewardDataHolder;
import com.l2jmobius.gameserver.model.OneDayRewardPlayerEntry;
import com.l2jmobius.gameserver.enums.DailyMissionStatus;
import com.l2jmobius.gameserver.handler.AbstractDailyMissionHandler;
import com.l2jmobius.gameserver.model.DailyMissionDataHolder;
import com.l2jmobius.gameserver.model.DailyMissionPlayerEntry;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.events.Containers;
import com.l2jmobius.gameserver.model.events.EventType;
@@ -29,11 +29,11 @@ import com.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener;
/**
* @author UnAfraid
*/
public class OlympiadOneDayRewardHandler extends AbstractOneDayRewardHandler
public class OlympiadDailyMissionHandler extends AbstractDailyMissionHandler
{
private final int _amount;
public OlympiadOneDayRewardHandler(OneDayRewardDataHolder holder)
public OlympiadDailyMissionHandler(DailyMissionDataHolder holder)
{
super(holder);
_amount = holder.getRequiredCompletions();
@@ -48,7 +48,7 @@ public class OlympiadOneDayRewardHandler extends AbstractOneDayRewardHandler
@Override
public boolean isAvailable(L2PcInstance player)
{
final OneDayRewardPlayerEntry entry = getPlayerEntry(player.getObjectId(), false);
final DailyMissionPlayerEntry entry = getPlayerEntry(player.getObjectId(), false);
if (entry != null)
{
switch (entry.getStatus())
@@ -57,7 +57,7 @@ public class OlympiadOneDayRewardHandler extends AbstractOneDayRewardHandler
{
if (entry.getProgress() >= _amount)
{
entry.setStatus(OneDayRewardStatus.AVAILABLE);
entry.setStatus(DailyMissionStatus.AVAILABLE);
storePlayerEntry(entry);
}
break;
@@ -73,22 +73,22 @@ public class OlympiadOneDayRewardHandler extends AbstractOneDayRewardHandler
private void onOlympiadMatchResult(OnOlympiadMatchResult event)
{
final OneDayRewardPlayerEntry winnerEntry = getPlayerEntry(event.getWinner().getObjectId(), true);
if (winnerEntry.getStatus() == OneDayRewardStatus.NOT_AVAILABLE)
final DailyMissionPlayerEntry winnerEntry = getPlayerEntry(event.getWinner().getObjectId(), true);
if (winnerEntry.getStatus() == DailyMissionStatus.NOT_AVAILABLE)
{
if (winnerEntry.increaseProgress() >= _amount)
{
winnerEntry.setStatus(OneDayRewardStatus.AVAILABLE);
winnerEntry.setStatus(DailyMissionStatus.AVAILABLE);
}
storePlayerEntry(winnerEntry);
}
final OneDayRewardPlayerEntry loseEntry = getPlayerEntry(event.getLoser().getObjectId(), true);
if (loseEntry.getStatus() == OneDayRewardStatus.NOT_AVAILABLE)
final DailyMissionPlayerEntry loseEntry = getPlayerEntry(event.getLoser().getObjectId(), true);
if (loseEntry.getStatus() == DailyMissionStatus.NOT_AVAILABLE)
{
if (loseEntry.increaseProgress() >= _amount)
{
loseEntry.setStatus(OneDayRewardStatus.AVAILABLE);
loseEntry.setStatus(DailyMissionStatus.AVAILABLE);
}
storePlayerEntry(loseEntry);
}

24
trunk/dist/game/data/scripts/handlers/onedayrewardshandlers/QuestOneDayRewardHandler.java → trunk/dist/game/data/scripts/handlers/dailymissionhandlers/QuestDailyMissionHandler.java vendored
View File

@@ -14,13 +14,13 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package handlers.onedayrewardshandlers;
package handlers.dailymissionhandlers;
import com.l2jmobius.gameserver.enums.OneDayRewardStatus;
import com.l2jmobius.gameserver.enums.DailyMissionStatus;
import com.l2jmobius.gameserver.enums.QuestType;
import com.l2jmobius.gameserver.handler.AbstractOneDayRewardHandler;
import com.l2jmobius.gameserver.model.OneDayRewardDataHolder;
import com.l2jmobius.gameserver.model.OneDayRewardPlayerEntry;
import com.l2jmobius.gameserver.handler.AbstractDailyMissionHandler;
import com.l2jmobius.gameserver.model.DailyMissionDataHolder;
import com.l2jmobius.gameserver.model.DailyMissionPlayerEntry;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.events.Containers;
import com.l2jmobius.gameserver.model.events.EventType;
@@ -30,11 +30,11 @@ import com.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener;
/**
* @author UnAfraid
*/
public class QuestOneDayRewardHandler extends AbstractOneDayRewardHandler
public class QuestDailyMissionHandler extends AbstractDailyMissionHandler
{
private final int _amount;
public QuestOneDayRewardHandler(OneDayRewardDataHolder holder)
public QuestDailyMissionHandler(DailyMissionDataHolder holder)
{
super(holder);
_amount = holder.getRequiredCompletions();
@@ -49,7 +49,7 @@ public class QuestOneDayRewardHandler extends AbstractOneDayRewardHandler
@Override
public boolean isAvailable(L2PcInstance player)
{
final OneDayRewardPlayerEntry entry = getPlayerEntry(player.getObjectId(), false);
final DailyMissionPlayerEntry entry = getPlayerEntry(player.getObjectId(), false);
if (entry != null)
{
switch (entry.getStatus())
@@ -58,7 +58,7 @@ public class QuestOneDayRewardHandler extends AbstractOneDayRewardHandler
{
if (entry.getProgress() >= _amount)
{
entry.setStatus(OneDayRewardStatus.AVAILABLE);
entry.setStatus(DailyMissionStatus.AVAILABLE);
storePlayerEntry(entry);
}
break;
@@ -77,12 +77,12 @@ public class QuestOneDayRewardHandler extends AbstractOneDayRewardHandler
final L2PcInstance player = event.getActiveChar();
if (event.getQuestType() == QuestType.DAILY)
{
final OneDayRewardPlayerEntry entry = getPlayerEntry(player.getObjectId(), true);
if (entry.getStatus() == OneDayRewardStatus.NOT_AVAILABLE)
final DailyMissionPlayerEntry entry = getPlayerEntry(player.getObjectId(), true);
if (entry.getStatus() == DailyMissionStatus.NOT_AVAILABLE)
{
if (entry.increaseProgress() >= _amount)
{
entry.setStatus(OneDayRewardStatus.AVAILABLE);
entry.setStatus(DailyMissionStatus.AVAILABLE);
}
storePlayerEntry(entry);
}

20
trunk/dist/game/data/scripts/handlers/onedayrewardshandlers/SiegeOneDayRewardHandler.java → trunk/dist/game/data/scripts/handlers/dailymissionhandlers/SiegeDailyMissionHandler.java vendored
View File

@@ -14,15 +14,15 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package handlers.onedayrewardshandlers;
package handlers.dailymissionhandlers;
import com.l2jmobius.gameserver.data.sql.impl.ClanTable;
import com.l2jmobius.gameserver.enums.OneDayRewardStatus;
import com.l2jmobius.gameserver.handler.AbstractOneDayRewardHandler;
import com.l2jmobius.gameserver.enums.DailyMissionStatus;
import com.l2jmobius.gameserver.handler.AbstractDailyMissionHandler;
import com.l2jmobius.gameserver.model.DailyMissionDataHolder;
import com.l2jmobius.gameserver.model.DailyMissionPlayerEntry;
import com.l2jmobius.gameserver.model.L2Clan;
import com.l2jmobius.gameserver.model.L2SiegeClan;
import com.l2jmobius.gameserver.model.OneDayRewardDataHolder;
import com.l2jmobius.gameserver.model.OneDayRewardPlayerEntry;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.events.Containers;
import com.l2jmobius.gameserver.model.events.EventType;
@@ -32,9 +32,9 @@ import com.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener;
/**
* @author UnAfraid
*/
public class SiegeOneDayRewardHandler extends AbstractOneDayRewardHandler
public class SiegeDailyMissionHandler extends AbstractDailyMissionHandler
{
public SiegeOneDayRewardHandler(OneDayRewardDataHolder holder)
public SiegeDailyMissionHandler(DailyMissionDataHolder holder)
{
super(holder);
}
@@ -48,7 +48,7 @@ public class SiegeOneDayRewardHandler extends AbstractOneDayRewardHandler
@Override
public boolean isAvailable(L2PcInstance player)
{
final OneDayRewardPlayerEntry entry = getPlayerEntry(player.getObjectId(), false);
final DailyMissionPlayerEntry entry = getPlayerEntry(player.getObjectId(), false);
if (entry != null)
{
switch (entry.getStatus())
@@ -75,8 +75,8 @@ public class SiegeOneDayRewardHandler extends AbstractOneDayRewardHandler
{
clan.getOnlineMembers(0).forEach(player ->
{
final OneDayRewardPlayerEntry entry = getPlayerEntry(player.getObjectId(), true);
entry.setStatus(OneDayRewardStatus.AVAILABLE);
final DailyMissionPlayerEntry entry = getPlayerEntry(player.getObjectId(), true);
entry.setStatus(DailyMissionStatus.AVAILABLE);
storePlayerEntry(entry);
});
}