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

Addition of dailyReset mission parameter.

Browse Source
This commit is contained in:
MobiusDevelopment
2019-11-14 06:40:18 +00:00
parent d56fc0d538
commit e5857a4f25
46 changed files with 517 additions and 223 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
L2J_Mobius_6.0_Fafurion/dist/game/data/DailyMission.xml vendored
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="xsd/DailyMission.xsd">
<reward id="1001" name="Hunt Lv. 85+ monsters" requiredCompletion="500" isOneTime="false">
<reward id="1001" name="Hunt Lv. 85+ monsters" requiredCompletion="500" isOneTime="false" dailyReset="false">
<!-- Hunt 500 monsters in any hunting ground. (A monster kill is only valid when XP was gained from it.) -->
<handler name="monster">
<param name="minLevel">85</param>
@@ -20,7 +20,7 @@
</items>
</reward>
-->
<reward id="1006" name="Ashen Shadow and Mystic Tavern" requiredCompletion="2" isOneTime="false">
<reward id="1006" name="Ashen Shadow and Mystic Tavern" requiredCompletion="2" isOneTime="false" dailyReset="false">
<!-- Defeat any of the following instanced zone monsters twice. Ashen Shadow Revolutionaries: Final Phase Commander Mystic Tavern Tauti: Seal Angel Mystic Tavern Freya: Frost Glacier Golem Mystic Tavern Kelbim: Typhoon Mystic Tavern Kain: Alfred von Hellmann -->
<handler name="monster">
<param name="ids">23653,23654,23655,23656,23657,23658,23659,23660,23661,23662,23663,23664,23684,23685,23686</param> <!-- TODO: Check ids Typhoon (25539?) and Alfred von Hellmann -->
@@ -32,7 +32,7 @@
<item id="-300" count="2000" /> <!-- Fame -->
</items>
</reward>
<reward id="1007" name="Go Fishing" requiredCompletion="100" isOneTime="false">
<reward id="1007" name="Go Fishing" requiredCompletion="100" isOneTime="false" dailyReset="false">
<!-- Successfully catch any type of fish 100 times at the Fishing Dock. -->
<handler name="fishing" />
<items>
@@ -63,7 +63,7 @@
</items>
</reward>
-->
<reward id="1014" name="Command Channel Instance Zone - Stage 1" requiredCompletion="2" isOneTime="false">
<reward id="1014" name="Command Channel Instance Zone - Stage 1" requiredCompletion="2" isOneTime="false" dailyReset="false">
<!-- Defeat any of the following Instance Zone bosses twice while in command channel. Crystal Prison: Balok Octavis' Cavern: Octavis -->
<handler name="monster">
<param name="ids">29218,29194,29212</param>
@@ -96,7 +96,7 @@
</items>
</reward>
-->
<reward id="1017" name="Command Channel Instance Zone - Stage 2" requiredCompletion="2" isOneTime="false">
<reward id="1017" name="Command Channel Instance Zone - Stage 2" requiredCompletion="2" isOneTime="false" dailyReset="false">
<!-- Defeat any of the following Instance Zone bosses twice while in command channel. Octavis' Cavern (Epic): Octavis Tauti's Cavern: Tauti Tauti's Cavern (Epic): Tauti Inner Messiah's Castle: Camille -->
<handler name="monster">
<param name="ids">29194,29212,29236,29237,26236</param> <!-- TODO: Check Camille id 26236 -->
@@ -122,7 +122,7 @@
</items>
</reward>
-->
<reward id="2002" name="Lv. 100-105 Field Boss Hunt" requiredCompletion="2" isOneTime="false">
<reward id="2002" name="Lv. 100-105 Field Boss Hunt" requiredCompletion="1" isOneTime="false">
<!-- Defeat 1 of the following twice. Kelbim Ramona -->
<handler name="monster">
<param name="ids">26124,26143</param>
@@ -143,7 +143,7 @@
</items>
</reward>
-->
<reward id="2004" name="Catch Nimble Fish" requiredCompletion="2500" isOneTime="false">
<reward id="2004" name="Catch Nimble Fish" requiredCompletion="2500" isOneTime="false" dailyReset="false">
<!-- Catch 2500 Nimble Fish at the Fishing Dock. -->
<handler name="fishing" />
<items>
@@ -151,7 +151,7 @@
<item id="-300" count="1000" /> <!-- Fame -->
</items>
</reward>
<reward id="2005" name="Dimensional Warp Assault" requiredCompletion="100" isOneTime="false">
<reward id="2005" name="Dimensional Warp Assault" requiredCompletion="100" isOneTime="false" dailyReset="false">
<!-- Defeat the following monster 100 times in the Dimensional Warp. Dimensional Bugbear -->
<handler name="monster">
<param name="ids">23465</param>
@@ -573,7 +573,7 @@
</items>
</reward>
-->
<reward id="3027" name="Monster Hunting: First Steps" requiredCompletion="20000">
<reward id="3027" name="Monster Hunting: First Steps" requiredCompletion="20000" dailyReset="false">
<!-- Hunt 20000 monsters in any hunting ground. (A monster kill is only valid when XP was gained from it.) -->
<handler name="monster">
<param name="minLevel">1</param>
@@ -584,7 +584,7 @@
<item id="-300" count="3000" /> <!-- Fame -->
</items>
</reward>
<reward id="3028" name="Monster Hunting: Seasoned" requiredCompletion="60000">
<reward id="3028" name="Monster Hunting: Seasoned" requiredCompletion="60000" dailyReset="false">
<!-- Hunt 60000 monsters in any hunting ground. (A monster kill is only valid when XP was gained from it.) -->
<handler name="monster">
<param name="minLevel">1</param>
@@ -595,7 +595,7 @@
<item id="-300" count="9000" /> <!-- Fame -->
</items>
</reward>
<reward id="3029" name="Monster Hunting: Expert" requiredCompletion="120000">
<reward id="3029" name="Monster Hunting: Expert" requiredCompletion="120000" dailyReset="false">
<!-- Hunt 120000 monsters in any hunting ground. (A monster kill is only valid when XP was gained from it.) -->
<handler name="monster">
<param name="minLevel">1</param>
@@ -606,7 +606,7 @@
<item id="-300" count="18000" /> <!-- Fame -->
</items>
</reward>
<reward id="3030" name="Rare Tavern Monster Hunting" requiredCompletion="10">
<reward id="3030" name="Rare Tavern Monster Hunting" requiredCompletion="10" dailyReset="false">
<!-- Defeat any of the following monsters that appear rarely in the Mystic Tavern 10 times. Mystic Tavern Tauti: Ifrit Mystic Tavern Freya: Ice Knight Mystic Tavern Kelbim: Domithan Mystic Tavern Kain: Eilhalder von Hellmann -->
<handler name="monster">
<param name="ids">23704,23703,23696,24068</param>
@@ -630,7 +630,7 @@
<item id="-300" count="2000" /> <!-- Fame -->
</items>
</reward>
<reward id="3032" name="World Boss Raid: Seasoned" requiredCompletion="10">
<reward id="3032" name="World Boss Raid: Seasoned" requiredCompletion="10" dailyReset="false">
<!-- Defeat 1 of the following 10 times. Antharas Valakas Lindvior Fafurion Helios Etis van Etina -->
<handler name="monster">
<param name="ids">29068,29028,29240,29367,29305,29319</param>
@@ -642,7 +642,7 @@
<item id="-300" count="10000" /> <!-- Fame -->
</items>
</reward>
<reward id="3033" name="World Boss Raid: Expert" requiredCompletion="30">
<reward id="3033" name="World Boss Raid: Expert" requiredCompletion="30" dailyReset="false">
<!-- Defeat 1 of the following 30 times. Antharas Valakas Lindvior Fafurion Helios Etis van Etina -->
<handler name="monster">
<param name="ids">29068,29028,29240,29367,29305,29319</param>
@@ -757,7 +757,7 @@
</items>
</reward>
-->
<reward id="3047" name="Angler's Descendant" requiredCompletion="72000">
<reward id="3047" name="Angler's Descendant" requiredCompletion="72000" dailyReset="false">
<!-- Successfully catch any type of fish 72000 times at the Fishing Dock. -->
<handler name="fishing" />
<items>

1
L2J_Mobius_6.0_Fafurion/dist/game/data/xsd/DailyMission.xsd vendored
View File

@@ -37,6 +37,7 @@
<xs:attribute type="xs:short" name="reward_id" />
<xs:attribute type="xs:string" name="name" />
<xs:attribute type="xs:int" name="requiredCompletion" />
<xs:attribute type="xs:boolean" name="dailyReset" />
<xs:attribute type="xs:boolean" name="isOneTime" />
<xs:attribute type="xs:boolean" name="isMainClassOnly" />
<xs:attribute type="xs:boolean" name="isDualClassOnly" />

35
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/handler/AbstractDailyMissionHandler.java
View File

@@ -84,21 +84,34 @@ public abstract class AbstractDailyMissionHandler extends ListenersContainer
public synchronized void reset()
{
try (Connection con = DatabaseFactory.getConnection();
PreparedStatement ps = con.prepareStatement("DELETE FROM character_daily_rewards WHERE rewardId = ? AND status = ?"))
if (_holder.dailyReset())
{
ps.setInt(1, _holder.getId());
ps.setInt(2, DailyMissionStatus.COMPLETED.getClientId());
ps.execute();
try (Connection con = DatabaseFactory.getConnection();
PreparedStatement ps = con.prepareStatement("DELETE FROM character_daily_rewards WHERE rewardId = ? AND status = ?"))
{
ps.setInt(1, _holder.getId());
ps.setInt(2, DailyMissionStatus.COMPLETED.getClientId());
ps.execute();
}
catch (SQLException e)
{
LOGGER.log(Level.WARNING, "Error while clearing data for: " + getClass().getSimpleName(), e);
}
}
catch (SQLException e)
else
{
LOGGER.log(Level.WARNING, "Error while clearing data for: " + getClass().getSimpleName(), e);
}
finally
{
_entries.clear();
try (Connection con = DatabaseFactory.getConnection();
PreparedStatement ps = con.prepareStatement("DELETE FROM character_daily_rewards WHERE rewardId = ? AND status = 3"))
{
ps.setInt(1, _holder.getId());
ps.execute();
}
catch (SQLException e)
{
LOGGER.log(Level.WARNING, "Error while clearing data for: " + getClass().getSimpleName(), e);
}
}
_entries.clear();
}
public boolean requestReward(PlayerInstance player)

7
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/DailyMissionDataHolder.java
View File

@@ -37,6 +37,7 @@ public class DailyMissionDataHolder
private final List<ClassId> _classRestriction;
private final int _requiredCompletions;
private final StatsSet _params;
private final boolean _dailyReset;
private final boolean _isOneTime;
private final boolean _isMainClassOnly;
private final boolean _isDualClassOnly;
@@ -53,6 +54,7 @@ public class DailyMissionDataHolder
_rewardsItems = set.getList("items", ItemHolder.class);
_classRestriction = set.getList("classRestriction", ClassId.class);
_params = set.getObject("params", StatsSet.class);
_dailyReset = set.getBoolean("dailyReset", true);
_isOneTime = set.getBoolean("isOneTime", true);
_isMainClassOnly = set.getBoolean("isMainClassOnly", true);
_isDualClassOnly = set.getBoolean("isDualClassOnly", false);
@@ -90,6 +92,11 @@ public class DailyMissionDataHolder
return _params;
}
public boolean dailyReset()
{
return _dailyReset;
}
public boolean isOneTime()
{
return _isOneTime;