diff --git a/trunk/dist/game/data/scripts/handlers/MasterHandler.java b/trunk/dist/game/data/scripts/handlers/MasterHandler.java
index 20dd711041..6ae58ac492 100644
--- a/trunk/dist/game/data/scripts/handlers/MasterHandler.java
+++ b/trunk/dist/game/data/scripts/handlers/MasterHandler.java
@@ -99,9 +99,9 @@ import handlers.admincommandhandlers.AdminMessages;
import handlers.admincommandhandlers.AdminMobGroup;
import handlers.admincommandhandlers.AdminMonsterRace;
import handlers.admincommandhandlers.AdminOlympiad;
-import handlers.admincommandhandlers.AdminPcCafePoints;
import handlers.admincommandhandlers.AdminPForge;
import handlers.admincommandhandlers.AdminPathNode;
+import handlers.admincommandhandlers.AdminPcCafePoints;
import handlers.admincommandhandlers.AdminPcCondOverride;
import handlers.admincommandhandlers.AdminPetition;
import handlers.admincommandhandlers.AdminPledge;
diff --git a/trunk/java/com/l2jmobius/gameserver/model/actor/stat/PcStat.java b/trunk/java/com/l2jmobius/gameserver/model/actor/stat/PcStat.java
index c760880b13..788d9e1afd 100644
--- a/trunk/java/com/l2jmobius/gameserver/model/actor/stat/PcStat.java
+++ b/trunk/java/com/l2jmobius/gameserver/model/actor/stat/PcStat.java
@@ -41,8 +41,8 @@ import com.l2jmobius.gameserver.network.serverpackets.SocialAction;
import com.l2jmobius.gameserver.network.serverpackets.SystemMessage;
import com.l2jmobius.gameserver.network.serverpackets.UserInfo;
import com.l2jmobius.gameserver.network.serverpackets.ability.ExAcquireAPSkillList;
+import com.l2jmobius.gameserver.network.serverpackets.dailymission.ExOneDayReceiveRewardList;
import com.l2jmobius.gameserver.network.serverpackets.friend.L2FriendStatus;
-import com.l2jmobius.gameserver.network.serverpackets.onedayreward.ExOneDayReceiveRewardList;
import com.l2jmobius.gameserver.util.Util;
public class PcStat extends PlayableStat
diff --git a/trunk/java/com/l2jmobius/gameserver/network/client/ExIncomingPackets.java b/trunk/java/com/l2jmobius/gameserver/network/client/ExIncomingPackets.java
index 3cd486799c..2566296b71 100644
--- a/trunk/java/com/l2jmobius/gameserver/network/client/ExIncomingPackets.java
+++ b/trunk/java/com/l2jmobius/gameserver/network/client/ExIncomingPackets.java
@@ -61,6 +61,8 @@ import com.l2jmobius.gameserver.network.clientpackets.compound.RequestNewEnchant
import com.l2jmobius.gameserver.network.clientpackets.compound.RequestNewEnchantTry;
import com.l2jmobius.gameserver.network.clientpackets.crystalization.RequestCrystallizeEstimate;
import com.l2jmobius.gameserver.network.clientpackets.crystalization.RequestCrystallizeItemCancel;
+import com.l2jmobius.gameserver.network.clientpackets.dailymission.RequestOneDayRewardReceive;
+import com.l2jmobius.gameserver.network.clientpackets.dailymission.RequestTodoList;
import com.l2jmobius.gameserver.network.clientpackets.ensoul.RequestItemEnsoul;
import com.l2jmobius.gameserver.network.clientpackets.friend.RequestFriendDetailInfo;
import com.l2jmobius.gameserver.network.clientpackets.mentoring.ConfirmMenteeAdd;
@@ -68,8 +70,6 @@ import com.l2jmobius.gameserver.network.clientpackets.mentoring.RequestMenteeAdd
import com.l2jmobius.gameserver.network.clientpackets.mentoring.RequestMenteeWaitingList;
import com.l2jmobius.gameserver.network.clientpackets.mentoring.RequestMentorCancel;
import com.l2jmobius.gameserver.network.clientpackets.mentoring.RequestMentorList;
-import com.l2jmobius.gameserver.network.clientpackets.onedayreward.RequestOneDayRewardReceive;
-import com.l2jmobius.gameserver.network.clientpackets.onedayreward.RequestTodoList;
import com.l2jmobius.gameserver.network.clientpackets.pledgebonus.RequestPledgeBonusOpen;
import com.l2jmobius.gameserver.network.clientpackets.pledgebonus.RequestPledgeBonusReward;
import com.l2jmobius.gameserver.network.clientpackets.pledgebonus.RequestPledgeBonusRewardList;
diff --git a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
index 1b4e18da9f..3c75f46a67 100644
--- a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
+++ b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
@@ -98,8 +98,8 @@ import com.l2jmobius.gameserver.network.serverpackets.SkillCoolTime;
import com.l2jmobius.gameserver.network.serverpackets.SkillList;
import com.l2jmobius.gameserver.network.serverpackets.SystemMessage;
import com.l2jmobius.gameserver.network.serverpackets.ability.ExAcquireAPSkillList;
+import com.l2jmobius.gameserver.network.serverpackets.dailymission.ExOneDayReceiveRewardList;
import com.l2jmobius.gameserver.network.serverpackets.friend.L2FriendList;
-import com.l2jmobius.gameserver.network.serverpackets.onedayreward.ExOneDayReceiveRewardList;
/**
* Enter World Packet Handler
diff --git a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/onedayreward/RequestOneDayRewardReceive.java b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java
similarity index 86%
rename from trunk/java/com/l2jmobius/gameserver/network/clientpackets/onedayreward/RequestOneDayRewardReceive.java
rename to trunk/java/com/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java
index 6d1e6d25f0..07ba14db0b 100644
--- a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/onedayreward/RequestOneDayRewardReceive.java
+++ b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java
@@ -14,7 +14,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-package com.l2jmobius.gameserver.network.clientpackets.onedayreward;
+package com.l2jmobius.gameserver.network.clientpackets.dailymission;
import java.util.Collection;
@@ -24,19 +24,19 @@ import com.l2jmobius.gameserver.model.OneDayRewardDataHolder;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.network.client.L2GameClient;
import com.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
-import com.l2jmobius.gameserver.network.serverpackets.onedayreward.ExOneDayReceiveRewardList;
+import com.l2jmobius.gameserver.network.serverpackets.dailymission.ExOneDayReceiveRewardList;
/**
* @author Sdw
*/
public class RequestOneDayRewardReceive implements IClientIncomingPacket
{
- private int _id;
+ private int _reward;
@Override
public boolean read(L2GameClient client, PacketReader packet)
{
- _id = packet.readH();
+ _reward = packet.readC();
return true;
}
@@ -49,7 +49,7 @@ public class RequestOneDayRewardReceive implements IClientIncomingPacket
return;
}
- final Collection reward = OneDayRewardData.getInstance().getOneDayRewardData(_id);
+ final Collection reward = OneDayRewardData.getInstance().getOneDayRewardData(_reward);
if (reward.isEmpty())
{
return;
diff --git a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/onedayreward/RequestTodoList.java b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/dailymission/RequestTodoList.java
similarity index 73%
rename from trunk/java/com/l2jmobius/gameserver/network/clientpackets/onedayreward/RequestTodoList.java
rename to trunk/java/com/l2jmobius/gameserver/network/clientpackets/dailymission/RequestTodoList.java
index 52a3f96f56..80f5d3cd4f 100644
--- a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/onedayreward/RequestTodoList.java
+++ b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/dailymission/RequestTodoList.java
@@ -14,13 +14,13 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-package com.l2jmobius.gameserver.network.clientpackets.onedayreward;
+package com.l2jmobius.gameserver.network.clientpackets.dailymission;
import com.l2jmobius.commons.network.PacketReader;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.network.client.L2GameClient;
import com.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
-import com.l2jmobius.gameserver.network.serverpackets.onedayreward.ExOneDayReceiveRewardList;
+import com.l2jmobius.gameserver.network.serverpackets.dailymission.ExOneDayReceiveRewardList;
/**
* @author UnAfraid
@@ -29,13 +29,13 @@ public class RequestTodoList implements IClientIncomingPacket
{
private int _tab;
@SuppressWarnings("unused")
- private int _allLevels;
+ private int _showAllLevels;
@Override
public boolean read(L2GameClient client, PacketReader packet)
{
- _tab = packet.readC();
- _allLevels = packet.readC();
+ _tab = packet.readC(); // Daily Reward = 9, Event = 1, Instance Zone = 2
+ _showAllLevels = packet.readC(); // Disabled = 0, Enabled = 1
return true;
}
@@ -50,7 +50,17 @@ public class RequestTodoList implements IClientIncomingPacket
switch (_tab)
{
- case 9: // Daily Rewards
+ // case 1:
+ // {
+ // player.sendPacket(new ExTodoListInzone());
+ // break;
+ // }
+ // case 2:
+ // {
+ // player.sendPacket(new ExTodoListInzone());
+ // break;
+ // }
+ case 9:
{
player.sendPacket(new ExOneDayReceiveRewardList(player));
break;
diff --git a/trunk/java/com/l2jmobius/gameserver/network/clientpackets/dailymission/RequestTodoListHTML.java b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/dailymission/RequestTodoListHTML.java
new file mode 100644
index 0000000000..08c0042f01
--- /dev/null
+++ b/trunk/java/com/l2jmobius/gameserver/network/clientpackets/dailymission/RequestTodoListHTML.java
@@ -0,0 +1,45 @@
+/*
+ * 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 .
+ */
+package com.l2jmobius.gameserver.network.clientpackets.dailymission;
+
+import com.l2jmobius.commons.network.PacketReader;
+import com.l2jmobius.gameserver.network.client.L2GameClient;
+import com.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
+
+/**
+ * @author Mobius
+ */
+public class RequestTodoListHTML implements IClientIncomingPacket
+{
+ @SuppressWarnings("unused")
+ private int _tab;
+ @SuppressWarnings("unused")
+ private String _linkName;
+
+ @Override
+ public boolean read(L2GameClient client, PacketReader packet)
+ {
+ _tab = packet.readC();
+ _linkName = packet.readS();
+ return true;
+ }
+
+ @Override
+ public void run(L2GameClient client)
+ {
+ }
+}
diff --git a/trunk/java/com/l2jmobius/gameserver/network/serverpackets/onedayreward/ExOneDayReceiveRewardList.java b/trunk/java/com/l2jmobius/gameserver/network/serverpackets/dailymission/ExOneDayReceiveRewardList.java
similarity index 96%
rename from trunk/java/com/l2jmobius/gameserver/network/serverpackets/onedayreward/ExOneDayReceiveRewardList.java
rename to trunk/java/com/l2jmobius/gameserver/network/serverpackets/dailymission/ExOneDayReceiveRewardList.java
index 148464a230..d7e5f64aeb 100644
--- a/trunk/java/com/l2jmobius/gameserver/network/serverpackets/onedayreward/ExOneDayReceiveRewardList.java
+++ b/trunk/java/com/l2jmobius/gameserver/network/serverpackets/dailymission/ExOneDayReceiveRewardList.java
@@ -14,7 +14,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-package com.l2jmobius.gameserver.network.serverpackets.onedayreward;
+package com.l2jmobius.gameserver.network.serverpackets.dailymission;
import java.time.LocalDate;
import java.util.Collection;