Fretux/linuxdistro-roguelite
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add Packages inventory screen and auto-scrap duplicate package pulls

Browse Source 
Packages are unique-per-type; duplicate pulls now auto-scrap into Cache
(mirroring the distro dupe->Merges path) instead of a dead-end merges
pool, and the pull reveal shows "-> N cache" for the dupe card. Save
loading collapses any pre-existing duplicate package entries to the
highest-level instance and grants Cache for the extras, logging the
migration.

Also adds a dedicated Packages tab in the Collection screen (master
list with slot filter/sort + affordability hints, detail panel with
upgrade/scrap actions) so the whole inventory can be managed from one
place, sharing state with the existing per-distro Packages sub-tab.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01MQmck8EqqWxSq5uVZ4E7yN
This commit is contained in:
Claude
2026-07-09 09:04:46 +00:00
parent d0722c6bf9
commit 8c08b94d2b
6 changed files with 454 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/Scripts/UI/GamblingSceneController.cs
+34 -21
View File
@@ -297,20 +297,12 @@ namespace KernelPanic.UI
string displayName = reward.DisplayName;
if (reward.RewardType == GachaRewardType.Package)
{
PackageDefinition package = GrantRandomPackageByRarity(pending.PackageDatabase, collection, saveData, reward.StarRating, out bool duplicatePackage);
PackageDefinition package = GrantRandomPackageByRarity(pending.PackageDatabase, collection, saveData, reward.StarRating, out bool duplicatePackage, out int cacheAwarded);
if (package != null)
{
displayName = string.IsNullOrWhiteSpace(package.DisplayName) ? package.Id : package.DisplayName;
if (duplicatePackage)
{
outcomeKind = PullOutcomeKind.Dupe;
merges = Mathf.Max(1, GachaTuning.MergesPerDupe);
saveData.packageMerges += merges;
}
else
{
outcomeKind = PullOutcomeKind.Granted;
}
outcomeKind = duplicatePackage ? PullOutcomeKind.Dupe : PullOutcomeKind.Granted;
merges = cacheAwarded;
}
}
@@ -373,7 +365,7 @@ namespace KernelPanic.UI
SummaryTotals totals = CalculateTotals();
if (!animate)
{
summaryTotalsLabel.text = FormatTotals(totals.Units, totals.Merges, totals.LanguagesText);
summaryTotalsLabel.text = FormatTotals(totals.Units, totals.Merges, totals.Cache, totals.LanguagesText);
return;
}
@@ -387,7 +379,8 @@ namespace KernelPanic.UI
float t = capturedStep / (float)SummaryTickSteps;
int units = Mathf.RoundToInt(Mathf.Lerp(0, totals.Units, t));
int merges = Mathf.RoundToInt(Mathf.Lerp(0, totals.Merges, t));
summaryTotalsLabel.text = FormatTotals(units, merges, capturedStep == SummaryTickSteps ? totals.LanguagesText : "...");
int cache = Mathf.RoundToInt(Mathf.Lerp(0, totals.Cache, t));
summaryTotalsLabel.text = FormatTotals(units, merges, cache, capturedStep == SummaryTickSteps ? totals.LanguagesText : "...");
if (capturedStep == SummaryTickSteps)
{
summaryTotalsLabel.RemoveFromClassList("summary-tick");
@@ -400,6 +393,7 @@ namespace KernelPanic.UI
{
int units = 0;
int merges = 0;
int cache = 0;
HashSet<Language> languages = new();
for (int i = 0; i < rewards.Count; i++)
{
@@ -408,21 +402,30 @@ namespace KernelPanic.UI
units++;
}
merges += rewards[i].MergesAwarded;
if (rewards[i].RewardType == GachaRewardType.Package)
{
cache += rewards[i].MergesAwarded;
}
else
{
merges += rewards[i].MergesAwarded;
}
for (int languageIndex = 0; languageIndex < rewards[i].LanguagesUnlocked.Count; languageIndex++)
{
languages.Add(rewards[i].LanguagesUnlocked[languageIndex]);
}
}
return new SummaryTotals(units, merges, FormatLanguages(languages));
return new SummaryTotals(units, merges, cache, FormatLanguages(languages));
}
private static string FormatTotals(int units, int merges, string languagesText)
private static string FormatTotals(int units, int merges, int cache, string languagesText)
{
string unitText = units == 0 ? "none" : units.ToString();
string mergeText = merges == 0 ? "none" : merges.ToString();
return $"units gained: {unitText} merges: {mergeText} languages unlocked: {languagesText}";
string cacheText = cache == 0 ? "none" : cache.ToString();
return $"units gained: {unitText} merges: {mergeText} cache: {cacheText} languages unlocked: {languagesText}";
}
private static string FormatLanguages(HashSet<Language> languages)
@@ -468,9 +471,10 @@ namespace KernelPanic.UI
return collection;
}
private static PackageDefinition GrantRandomPackageByRarity(PackageDatabase packageDatabase, PlayerCollection collection, SaveData saveData, int rarity, out bool duplicate)
private static PackageDefinition GrantRandomPackageByRarity(PackageDatabase packageDatabase, PlayerCollection collection, SaveData saveData, int rarity, out bool duplicate, out int cacheAwarded)
{
duplicate = false;
cacheAwarded = 0;
int count = packageDatabase == null ? 0 : packageDatabase.CountByRarity(rarity);
if (count <= 0)
{
@@ -484,8 +488,15 @@ namespace KernelPanic.UI
return null;
}
duplicate = collection.IsPackageOwned(package.Id) || saveData.ownedPackageIds.Exists(id => string.Equals(id, package.Id, StringComparison.OrdinalIgnoreCase));
if (!duplicate)
duplicate = collection.IsPackageOwned(package.Id);
if (duplicate)
{
// Packages are unique-per-type: a dupe never creates a second instance, it
// auto-scraps into Cache immediately, mirroring the distro dupe -> Merges path.
cacheAwarded = PackageTuning.GetCacheForRarity(package.Rarity);
saveData.cacheBalance += cacheAwarded;
}
else
{
collection.AddPackageSilently(package);
saveData.ownedPackages.Add(new OwnedPackageSaveEntry { id = package.Id, upgradeLevel = 0 });
@@ -758,15 +769,17 @@ namespace KernelPanic.UI
private readonly struct SummaryTotals
{
public SummaryTotals(int units, int merges, string languagesText)
public SummaryTotals(int units, int merges, int cache, string languagesText)
{
Units = units;
Merges = merges;
Cache = cache;
LanguagesText = languagesText;
}
public int Units { get; }
public int Merges { get; }
public int Cache { get; }
public string LanguagesText { get; }
}