2009Scape/Server
1
0
Fork 1
mirror of https://gitlab.com/2009scape/2009scape.git synced 2025-12-10 10:20:41 -07:00
Code Issues Projects Releases Packages Wiki Activity

Improved handling of achievement diary rewards

Browse source
This commit is contained in:
GregF 2024-04-15 00:10:56 +00:00 • committed by Ryan
parent 0ade8bdf02
commit 64b40fbcf4
1 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Server/src/main/core/game/node/entity/player/link/diary/AchievementDiary.java
View file

@ -489,7 +489,7 @@ public class AchievementDiary {
/** /**
* Determines if a replacement reward can be given for the particular diary and level. * Determines if a replacement reward can be given for the particular diary and level.
* Checks to make sure the player has completed the level and claimed the rewards, and has not completed * Checks to make sure the player has completed the level and claimed the rewards, and has not claimed
* the next diary level. * the next diary level.
* @param player the player to check * @param player the player to check
* @param type the DiaryType: LUMBRIDGE, FALADOR, etc. * @param type the DiaryType: LUMBRIDGE, FALADOR, etc.
@ -498,10 +498,10 @@ public class AchievementDiary {
*/ */
public static boolean canReplaceReward(Player player, DiaryType type, int level) { public static boolean canReplaceReward(Player player, DiaryType type, int level) {
Item reward = type.getRewards(level)[0]; Item reward = type.getRewards(level)[0];
return hasCompletedLevel(player, type, level) boolean claimed = hasCompletedLevel(player, type, level)
&& !hasCompletedLevel(player, type, level + 1)
&& hasClaimedLevelRewards(player, type, level) && hasClaimedLevelRewards(player, type, level)
&& !player.hasItem(reward); && !player.hasItem(reward);
return level == 2 ? claimed : claimed && !hasClaimedLevelRewards(player, type, level+1);
} }
/** /**
@ -543,14 +543,18 @@ public class AchievementDiary {
/** /**
* Checks if a player can claim the rewards for the given level of the given diary * Checks if a player can claim the rewards for the given level of the given diary
* Checks to make sure the player hasn't completed the next level. * Checks to make sure the player hasn't claimed the next level.
* @param player the player to check * @param player the player to check
* @param type the DiaryType: LUMBRIDGE, FALADOR, etc. * @param type the DiaryType: LUMBRIDGE, FALADOR, etc.
* @param level the level to check * @param level the level to check
* @return whether or not the player can claim the rewards * @return whether or not the player can claim the rewards
*/ */
public static boolean canClaimLevelRewards(Player player, DiaryType type, int level) { public static boolean canClaimLevelRewards(Player player, DiaryType type, int level) {
return !hasCompletedLevel(player, type, level + 1) && hasCompletedLevel(player, type, level) && !hasClaimedLevelRewards(player, type, level); if (level == 2)
// Cannot be a higher level to claim
return hasCompletedLevel(player, type, level) && !hasClaimedLevelRewards(player, type, level);
else
return !hasClaimedLevelRewards(player, type, level + 1) && hasCompletedLevel(player, type, level) && !hasClaimedLevelRewards(player, type, level);
} }
/** /**