TheSunIsLeaking/DorkNet
3
0
Fork 0
mirror of https://github.com/DorkSquadRR/DorkNet.git synced 2026-10-25 23:18:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

feat: refactor equipment payload methods to unify handling and remove gift box specific logic

Browse Source
This commit is contained in:
Alexa
2026-06-07 10:39:08 +03:00
parent f27d16c4fe
commit feccd439d4
3 changed files with 55 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
DorkNet.Server/Controllers/API/Store/StorefrontsBuyController.cs
+2 -2
View File
@@ -103,7 +103,7 @@ public class StorefrontsBuyController(
StoreService.TryGetAvatarItemPayload(item.Slug, out var avatarItemType, out avatarItemDesc);
var inventoryAvatarDesc = StoreService.InventoryAvatarItemDesc(avatarItemDesc);
StoreService.TryGetConsumableItemDesc(item.Slug, out var consumableItemDesc);
StoreService.TryGetGiftBoxEquipmentPayload(item.Slug, out var equipmentPrefabName, out var equipmentModificationGuid);
StoreService.TryGetEquipmentPayload(item.Slug, out var equipmentPrefabName, out var equipmentModificationGuid);
if (StoreService.TryGetHairDyePayload(item.Slug, out var hairDyeConsumableDesc, out var hairDyeColorGuid))
{
avatarItemType = 1;
@@ -352,7 +352,7 @@ public class StorefrontsBuyController(
{
StoreService.TryGetAvatarItemPayload(grantedSlug, out avatarItemType, out avatarItemDesc);
StoreService.TryGetConsumableItemDesc(grantedSlug, out consumableItemDesc);
StoreService.TryGetGiftBoxEquipmentPayload(grantedSlug, out equipmentPrefabName, out equipmentModificationGuid);
StoreService.TryGetEquipmentPayload(grantedSlug, out equipmentPrefabName, out equipmentModificationGuid);
if (StoreService.TryGetHairDyePayload(grantedSlug, out var hairDyeConsumableDesc, out var hairDyeColorGuid))
{
avatarItemType = 1;
DorkNet.Server/Services/StoreService.cs
+1 -35
View File
@@ -383,40 +383,6 @@ public class StoreService(DorkNetDbContext db, LevelService level, IConfiguratio
out string modificationGuid) =>
TryGetEquipmentPayload(slug, out prefabName, out modificationGuid, out _);
public static bool TryGetGiftBoxEquipmentPayload(
string? slug,
out string prefabName,
out string modificationGuid,
out EquipmentSkinEntry? entry)
{
if (!TryGetEquipmentPayload(slug, out prefabName, out modificationGuid, out entry))
return false;
// The 2020 client previews GiftPackage equipment by spawning the
// prefab. Spawning [MakerPen] outside the real tool equip flow wakes
// MakerPen tool scripts without their visuals wired up, causing a
// repeating MakerPenVisuals null-ref/spin. Still grant the skin as
// inventory; just don't ask the gift-box/store-preview path to spawn it.
if (IsMakerPenPrefab(prefabName))
{
prefabName = string.Empty;
modificationGuid = string.Empty;
entry = null;
return false;
}
return true;
}
public static bool TryGetGiftBoxEquipmentPayload(
string? slug,
out string prefabName,
out string modificationGuid) =>
TryGetGiftBoxEquipmentPayload(slug, out prefabName, out modificationGuid, out _);
private static bool IsMakerPenPrefab(string? prefabName) =>
string.Equals(prefabName, "[MakerPen]", StringComparison.OrdinalIgnoreCase);
private async Task SeedEquipmentSkinsAsync(HashSet<string> existingSlugs)
{
var catalog = _equipmentSkinCatalog.Value;
@@ -983,7 +949,7 @@ public class StoreService(DorkNetDbContext db, LevelService level, IConfiguratio
// here too.
TryGetAvatarItemPayload(i.Slug, out var avatarItemType, out var avatarItemDesc);
TryGetConsumableItemDesc(i.Slug, out var consumableItemDesc);
TryGetGiftBoxEquipmentPayload(i.Slug, out var equipmentPrefabName, out var equipmentModificationGuid, out var equipmentEntry);
TryGetEquipmentPayload(i.Slug, out var equipmentPrefabName, out var equipmentModificationGuid, out var equipmentEntry);
var isHairDye = TryGetHairDyePayload(i.Slug, out var consumableHairDyeDesc, out var hairDyeColorGuid);
if (isHairDye)
{