Skip to content

Add a setting for tracking winged goldens #139

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
viddie merged 2 commits into from
Jun 6, 2026
Merged

Add a setting for tracking winged goldens #139

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
db62889
Update ConsistencyTracker.csproj for compilation
Kongtiao552 May 19, 2026
d6607c7
Added a setting for tracking winged goldens
Kongtiao552 May 19, 2026
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
5 changes: 3 additions & 2 deletions ConsistencyTracker.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -516,7 +516,7 @@ private void Strawberry_OnPlayer(On.Celeste.Strawberry.orig_OnPlayer orig, Straw
LogVerbose($"Strawberry on player | self.Type: {self.GetType().Name}, self.Golden: {self.Golden}");
SetRoomCompleted(resetOnDeath: true);

if (self.Winged) {
if (self.Winged && !(CurrentChapterPath?.TrackWingedGolden ?? false)) {
if(!IgnoreBerryCollects.Contains(self.ID))
IgnoreBerryCollects.Add(self.ID);
LogVerbose($"Ignoring winged berry pickup.");
Expand Down Expand Up @@ -574,7 +574,7 @@ private void On_Strawberry_OnCollect(On.Celeste.Strawberry.orig_OnCollect orig,
break;
}

if (self.Golden && !self.Winged && SettingsTrackGoldens && !IsInFgrMode) { // In fgr mode, goldens dont exist, so they cant mark the end of the challenge.
if (self.Golden && SettingsTrackGoldens && !IsInFgrMode) { // In fgr mode, goldens dont exist, so they cant mark the end of the challenge.
Log($"Golden collected! GG :catpog:");
CurrentChapterStats.CollectedGolden(goldenType);
SaveChapterStats();
Expand Down Expand Up @@ -772,6 +772,7 @@ private void Level_OnTransitionTo(Level level, LevelData levelDataNext, Vector2

private void Player_OnDie(Player player) {
TouchedBerries.Clear();
IgnoreBerryCollects.Clear();

Log($"Player died. (holdingGolden: {IsInGoldenRun})");
if (CurrentRoomCompletedResetOnDeath) {
Expand Down
2 changes: 1 addition & 1 deletion ConsistencyTracker.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<CelesteIsCore Condition="Exists('$(CelestePrefix)\Celeste.dll')">true</CelesteIsCore>
<CelestePrefix Condition="$(CelesteIsCore)">$(CelestePrefix)\legacyRef</CelestePrefix>

<CelesteType Condition="'$(CelesteType)' == '' And Exists('$(CelesteGamePath)\BuildIsXNA.txt')">XNA</CelesteType>
<CelesteType Condition="'$(CelesteType)' == '' And Exists('$(CelestePrefix)\BuildIsXNA.txt')">XNA</CelesteType>
<CelesteType Condition="'$(CelesteType)' == ''">FNA</CelesteType>
<XNAPath Condition="'$(XNAPath)' == ''">$(WINDIR)\Microsoft.NET\assembly\GAC_32\{0}\v4.0_4.0.0.0__842cf8be1de50553\{0}.dll</XNAPath>
</PropertyGroup>
Expand Down
10 changes: 10 additions & 0 deletions ConsistencyTrackerSettings.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,6 +346,16 @@
OnPressed = Mod.UngroupRoomsOnChapterPath,
Disabled = !hasCurrentRoom
});

bool? currentPathTrackWingedGoldens = Mod.CurrentChapterPath?.TrackWingedGolden;
subMenu.Add(new TextMenu.OnOff(Dialog.Clean("MODOPTION_CCT_PATH_MANAGEMENT_EDITING_TRACK_WINGED_GOLDEN"), currentPathTrackWingedGoldens ?? false) {
OnValueChange = v => {
if (Mod.CurrentChapterPath == null) return;
Mod.CurrentChapterPath.TrackWingedGolden = v;
Mod.SaveActivePath();
},
Disabled = !hasPath
});

bool? currentRoomIsTransition = Mod.CurrentChapterPath?.CurrentRoom?.IsNonGameplayRoom;
List<KeyValuePair<bool, string>> RoomType = new List<KeyValuePair<bool, string>>() {
Expand Down Expand Up @@ -480,7 +490,7 @@
public void CreatePathGoldenTierSettingsEntry(TextMenu menu, bool inGame) {
TextMenuExt.SubMenu subMenu = new TextMenuExt.SubMenu("Path Golden Tier Settings", false);
menu.Add(subMenu);
TextMenu.Item menuItem;

Check warning on line 493 in ConsistencyTrackerSettings.cs

View workflow job for this annotation

GitHub Actions / build 

The variable 'menuItem' is declared but never used

Check warning on line 493 in ConsistencyTrackerSettings.cs

View workflow job for this annotation

GitHub Actions / build 

The variable 'menuItem' is declared but never used

if (!inGame) {
subMenu.Add(new TextMenu.SubHeader(Dialog.Clean("MODOPTION_CCT_PATH_MANAGEMENT_NOT_IN_GAME_HINT"), false));
Expand Down
1 change: 1 addition & 0 deletions Dialog/English.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ MODOPTION_CCT_PATH_MANAGEMENT_EDITING_BROWSER= Open Path Edit Tool In Browser (C
MODOPTION_CCT_PATH_MANAGEMENT_EDITING_REMOVE_CURRENT_ROOM= Remove Current Room From Path
MODOPTION_CCT_PATH_MANAGEMENT_EDITING_GROUP= Group Current And Previous Rooms
MODOPTION_CCT_PATH_MANAGEMENT_EDITING_UNGROUP= Ungroup Current From Previous Room
MODOPTION_CCT_PATH_MANAGEMENT_EDITING_TRACK_WINGED_GOLDEN= Track Winged Golden Berry

MODOPTION_CCT_PATH_MANAGEMENT_EDITING_ROOM_TYPE_TITLE= Current Room Type
MODOPTION_CCT_PATH_MANAGEMENT_EDITING_ROOM_TYPE_GAMEPLAY= Gameplay
Expand Down
3 changes: 3 additions & 0 deletions Models/PathInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,9 @@ public int GameplayRoomCount {

[JsonProperty("ignoredRooms")]
public List<string> IgnoredRooms { get; set; } = new List<string>();

[JsonProperty("trackWingedGolden")]
public bool TrackWingedGolden { get; set; } = false;


[JsonProperty("tier")]
Expand Down
Loading