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

Daily Mission changes.

Browse Source 
Contributed by kamikadzz.
This commit is contained in:
MobiusDevelopment
2022-10-08 22:49:25 +00:00
parent 18718b4148
commit 6201cf9303
170 changed files with 3483 additions and 2329 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/DailyMissionMasterHandler.java vendored
View File

@@ -23,6 +23,7 @@ import org.l2jmobius.gameserver.handler.DailyMissionHandler;
import handlers.dailymissionhandlers.BossDailyMissionHandler;
import handlers.dailymissionhandlers.CeremonyOfChaosDailyMissionHandler;
import handlers.dailymissionhandlers.FishingDailyMissionHandler;
import handlers.dailymissionhandlers.JoinClanDailyMissionHandler;
import handlers.dailymissionhandlers.LevelDailyMissionHandler;
import handlers.dailymissionhandlers.LoginMonthDailyMissionHandler;
import handlers.dailymissionhandlers.LoginWeekendDailyMissionHandler;
@@ -50,6 +51,7 @@ public class DailyMissionMasterHandler
DailyMissionHandler.getInstance().registerHandler("boss", BossDailyMissionHandler::new);
DailyMissionHandler.getInstance().registerHandler("monster", MonsterDailyMissionHandler::new);
DailyMissionHandler.getInstance().registerHandler("fishing", FishingDailyMissionHandler::new);
DailyMissionHandler.getInstance().registerHandler("joinclan", JoinClanDailyMissionHandler::new);
LOGGER.info(DailyMissionMasterHandler.class.getSimpleName() + ": Loaded " + DailyMissionHandler.getInstance().size() + " handlers.");
}
}

81
L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/dailymissionhandlers/JoinClanDailyMissionHandler.java vendored Normal file
View File

@@ -0,0 +1,81 @@
/*
* 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.dailymissionhandlers;
import java.util.function.Consumer;
import org.l2jmobius.gameserver.enums.DailyMissionStatus;
import org.l2jmobius.gameserver.handler.AbstractDailyMissionHandler;
import org.l2jmobius.gameserver.model.DailyMissionDataHolder;
import org.l2jmobius.gameserver.model.DailyMissionPlayerEntry;
import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.events.Containers;
import org.l2jmobius.gameserver.model.events.EventType;
import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerClanCreate;
import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerClanJoin;
import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener;
/**
* @author kamikadzz
*/
public class JoinClanDailyMissionHandler extends AbstractDailyMissionHandler
{
public JoinClanDailyMissionHandler(DailyMissionDataHolder holder)
{
super(holder);
}
@Override
public boolean isAvailable(Player player)
{
final DailyMissionPlayerEntry entry = getPlayerEntry(player.getObjectId(), false);
return (entry != null) && (entry.getStatus() == DailyMissionStatus.AVAILABLE);
}
@Override
public void init()
{
Containers.Global().addListener(new ConsumerEventListener(this, EventType.ON_PLAYER_CLAN_JOIN, (Consumer<OnPlayerClanJoin>) this::onPlayerClanJoin, this));
Containers.Global().addListener(new ConsumerEventListener(this, EventType.ON_PLAYER_CLAN_CREATE, (Consumer<OnPlayerClanCreate>) this::onPlayerClanCreate, this));
}
private void onPlayerClanJoin(OnPlayerClanJoin event)
{
final DailyMissionPlayerEntry missionData = getPlayerEntry(event.getClanMember().getPlayer().getObjectId(), true);
processMission(missionData);
}
private void onPlayerClanCreate(OnPlayerClanCreate event)
{
final DailyMissionPlayerEntry missionData = getPlayerEntry(event.getPlayer().getObjectId(), true);
processMission(missionData);
}
private void processMission(DailyMissionPlayerEntry missionData)
{
if (missionData.getProgress() == 1)
{
missionData.setStatus(DailyMissionStatus.COMPLETED);
}
else
{
missionData.setProgress(1);
missionData.setStatus(DailyMissionStatus.AVAILABLE);
}
storePlayerEntry(missionData);
}
}

18
L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/dailymissionhandlers/LoginMonthDailyMissionHandler.java vendored
View File

@@ -49,30 +49,14 @@ public class LoginMonthDailyMissionHandler extends AbstractDailyMissionHandler
Containers.Global().addListener(new ConsumerEventListener(this, EventType.ON_PLAYER_LOGIN, (OnPlayerLogin event) -> onPlayerLogin(event), this));
}
@Override
public void reset()
{
// Monthly rewards do not reset daily.
}
private void onPlayerLogin(OnPlayerLogin event)
{
final DailyMissionPlayerEntry entry = getPlayerEntry(event.getPlayer().getObjectId(), true);
final long lastCompleted = entry.getLastCompleted();
if (lastCompleted == 0) // Initial entry.
{
entry.setLastCompleted(System.currentTimeMillis());
}
else if ((System.currentTimeMillis() - lastCompleted) > 2506000000L) // 2506000000L (29 day) delay.
if (entry.getStatus() != DailyMissionStatus.COMPLETED)
{
entry.setProgress(1);
entry.setStatus(DailyMissionStatus.AVAILABLE);
}
else
{
entry.setProgress(0);
entry.setStatus(DailyMissionStatus.NOT_AVAILABLE);
}
storePlayerEntry(entry);
}
}

25
L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/dailymissionhandlers/LoginWeekendDailyMissionHandler.java vendored
View File

@@ -51,27 +51,18 @@ public class LoginWeekendDailyMissionHandler extends AbstractDailyMissionHandler
Containers.Global().addListener(new ConsumerEventListener(this, EventType.ON_PLAYER_LOGIN, (OnPlayerLogin event) -> onPlayerLogin(event), this));
}
@Override
public void reset()
{
// Weekend rewards do not reset daily.
}
private void onPlayerLogin(OnPlayerLogin event)
{
final DailyMissionPlayerEntry entry = getPlayerEntry(event.getPlayer().getObjectId(), true);
final int currentDay = Calendar.getInstance().get(Calendar.DAY_OF_WEEK);
final long lastCompleted = entry.getLastCompleted();
if (((currentDay == Calendar.SATURDAY) || (currentDay == Calendar.SUNDAY)) // Reward only on weekend.
&& ((lastCompleted == 0) || ((System.currentTimeMillis() - lastCompleted) > 172800000))) // Initial entry or 172800000 (2 day) delay.
if (entry.getStatus() != DailyMissionStatus.COMPLETED)
{
entry.setProgress(1);
entry.setStatus(DailyMissionStatus.AVAILABLE);
}
else if (entry.getStatus() != DailyMissionStatus.AVAILABLE) // Not waiting to be rewarded.
{
entry.setProgress(0);
entry.setStatus(DailyMissionStatus.NOT_AVAILABLE);
final int currentDay = Calendar.getInstance().get(Calendar.DAY_OF_WEEK);
if (((currentDay == Calendar.SATURDAY) || (currentDay == Calendar.SUNDAY) || (currentDay == Calendar.MONDAY)) //
&& (Calendar.getInstance().get(Calendar.HOUR_OF_DAY) < 6) && (Calendar.getInstance().get(Calendar.MINUTE) < 30))
{
entry.setProgress(1);
entry.setStatus(DailyMissionStatus.AVAILABLE);
}
}
storePlayerEntry(entry);
}

17
L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/dailymissionhandlers/MonsterDailyMissionHandler.java vendored
View File

@@ -105,13 +105,10 @@ public class MonsterDailyMissionHandler extends AbstractDailyMissionHandler
}
final Player player = event.getAttacker();
if (_minLevel > 0)
final int monsterLevel = monster.getLevel();
if ((_minLevel > 0) && ((monsterLevel < _minLevel) || (monsterLevel > _maxLevel) || ((player.getLevel() - monsterLevel) > 5)))
{
final int monsterLevel = monster.getLevel();
if ((monsterLevel < _minLevel) || (monsterLevel > _maxLevel) || ((player.getLevel() - monsterLevel) > 5))
{
return;
}
return;
}
final Party party = player.getParty();
@@ -119,7 +116,13 @@ public class MonsterDailyMissionHandler extends AbstractDailyMissionHandler
{
final CommandChannel channel = party.getCommandChannel();
final List<Player> members = channel != null ? channel.getMembers() : party.getMembers();
members.stream().filter(member -> member.calculateDistance3D(monster) <= Config.ALT_PARTY_RANGE).forEach(this::processPlayerProgress);
for (Player member : members)
{
if ((member.getLevel() >= (monsterLevel - 5)) && (member.calculateDistance3D(monster) <= Config.ALT_PARTY_RANGE))
{
processPlayerProgress(member);
}
}
}
else
{

1
L2J_Mobius_08.2_Homunculus/dist/game/data/xsd/DailyMission.xsd vendored
View File

@@ -42,6 +42,7 @@
<xs:attribute type="xs:boolean" name="isMainClassOnly" />
<xs:attribute type="xs:boolean" name="isDualClassOnly" />
<xs:attribute type="xs:boolean" name="isDisplayedWhenNotAvailable" />
<xs:attribute type="xs:string" name="duration" />
</xs:complexType>
<xs:complexType name="listType">
<xs:sequence>

28
L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/enums/MissionResetType.java Normal file
View File

@@ -0,0 +1,28 @@
/*
* 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 org.l2jmobius.gameserver.enums;
/**
* @author kamikadzz
*/
public enum MissionResetType
{
DAY,
WEEK,
MONTH,
WEEKEND
}

21
L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java
View File

@@ -16,11 +16,13 @@
*/
package org.l2jmobius.gameserver.model;
import java.util.Calendar;
import java.util.List;
import java.util.function.Function;
import org.l2jmobius.gameserver.enums.ClassId;
import org.l2jmobius.gameserver.enums.DailyMissionStatus;
import org.l2jmobius.gameserver.enums.MissionResetType;
import org.l2jmobius.gameserver.handler.AbstractDailyMissionHandler;
import org.l2jmobius.gameserver.handler.DailyMissionHandler;
import org.l2jmobius.gameserver.model.actor.Player;
@@ -42,6 +44,7 @@ public class DailyMissionDataHolder
private final boolean _isDualClassOnly;
private final boolean _isDisplayedWhenNotAvailable;
private final AbstractDailyMissionHandler _handler;
private final MissionResetType _missionResetSlot;
public DailyMissionDataHolder(StatSet set)
{
@@ -57,6 +60,7 @@ public class DailyMissionDataHolder
_isDualClassOnly = set.getBoolean("isDualClassOnly", false);
_isDisplayedWhenNotAvailable = set.getBoolean("isDisplayedWhenNotAvailable", true);
_handler = handler != null ? handler.apply(this) : null;
_missionResetSlot = set.getObject("duration", MissionResetType.class, MissionResetType.DAY);
}
public int getId()
@@ -171,7 +175,22 @@ public class DailyMissionDataHolder
{
if (_handler != null)
{
_handler.reset();
if ((_missionResetSlot == MissionResetType.WEEK) && (Calendar.getInstance().get(Calendar.DAY_OF_WEEK) == Calendar.MONDAY))
{
_handler.reset();
}
else if ((_missionResetSlot == MissionResetType.MONTH) && (Calendar.getInstance().get(Calendar.DAY_OF_MONTH) == 1))
{
_handler.reset();
}
else if ((_missionResetSlot == MissionResetType.WEEKEND) && (Calendar.getInstance().get(Calendar.DAY_OF_WEEK) == Calendar.SATURDAY))
{
_handler.reset();
}
else if (_dailyReset)
{
_handler.reset();
}
}
}
}