Skip to content

Add support for fisher_grade condition type and update mastery handling #561

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AngeloTadeucci merged 1 commit into from
Aug 25, 2025
Merged

Add support for fisher_grade condition type and update mastery handling #561

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions Maple2.Server.Game/Manager/MasteryManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using System.Numerics;
using System.Diagnostics;
using System.Numerics;
using Maple2.Model.Enum;
using Maple2.Model.Error;
using Maple2.Model.Game;
Expand Down Expand Up @@ -80,7 +81,11 @@ public int this[MasteryType type] {
session.Send(MasteryPacket.UpdateMastery(type, session.Mastery[type]));
int currentLevel = GetLevel(type);
if (startLevel < currentLevel || startValue == 0) {
session.ConditionUpdate(ConditionType.mastery_grade, codeLong: (int) type);
if (type == MasteryType.Fishing) {
session.ConditionUpdate(ConditionType.fisher_grade, codeLong: currentLevel);
} else {
session.ConditionUpdate(ConditionType.mastery_grade, codeLong: (int) type);
}
}
if (startLevel > currentLevel) {
session.ConditionUpdate(ConditionType.set_mastery_grade, codeLong: (int) type);
Expand Down
2 changes: 2 additions & 0 deletions Maple2.Server.Game/Util/ConditionUtil.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ private static bool CheckCode(this ConditionMetadata.Parameters code, GameSessio
break;
case ConditionType.map:
case ConditionType.fish:
case ConditionType.fisher_grade:
case ConditionType.mastery_grade:
case ConditionType.set_mastery_grade:
case ConditionType.item_add:
Expand Down Expand Up @@ -265,6 +266,7 @@ private static bool CheckTarget(this ConditionMetadata.Parameters target, GameSe
case ConditionType.fish_fail:
case ConditionType.fish_collect:
case ConditionType.fish_goldmedal:
case ConditionType.fisher_grade:
case ConditionType.mastery_grade:
case ConditionType.set_mastery_grade:
case ConditionType.music_play_grade:
Expand Down
Loading