Merge branch 'LBPUnion:main' into main

This commit is contained in:
LumaLivy 2021-11-08 11:31:26 -05:00 committed by GitHub
commit 0aeaa32a66
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 2 deletions

View file

@ -102,6 +102,8 @@
<s:Boolean x:Key="/Default/UserDictionary/Words/=PCAS/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=PCJS/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=PCKS/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=PCSA/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=PCSF/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Swingy/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=thumbsup/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=topscores/@EntryIndexedValue">True</s:Boolean>

View file

@ -60,8 +60,9 @@ namespace LBPUnion.ProjectLighthouse.Controllers
return this.Ok(slot.Serialize());
}
[HttpGet("slots/lbp2cool")]
[HttpGet("slots/cool")]
public async Task<IActionResult> CoolSlots([FromQuery] int page) => await NewestSlots(30 * page, 30);
public async Task<IActionResult> CoolSlots([FromQuery] int page) => await LuckyDipSlots(30 * page, 30, 69);
[HttpGet("slots")]
public async Task<IActionResult> NewestSlots([FromQuery] int pageStart, [FromQuery] int pageSize)

View file

@ -76,11 +76,17 @@ namespace LBPUnion.ProjectLighthouse.Helpers
"CUSA01304",
};
public static readonly string[] LittleBigPlanetVitaTitleIds =
{
"PCSF00021", "PCSA00017", "PCSC00013",
};
public static GameVersion FromTitleId(string titleId)
{
if (LittleBigPlanet1TitleIds.Contains(titleId)) return GameVersion.LittleBigPlanet1;
if (LittleBigPlanet2TitleIds.Contains(titleId)) return GameVersion.LittleBigPlanet2;
if (LittleBigPlanet3TitleIds.Contains(titleId)) return GameVersion.LittleBigPlanet3;
if (LittleBigPlanetVitaTitleIds.Contains(titleId)) return GameVersion.LittleBigPlanetVita;
return GameVersion.LittleBigPlanet1;
}

View file

@ -5,6 +5,7 @@ namespace LBPUnion.ProjectLighthouse.Types
LittleBigPlanet1 = 0,
LittleBigPlanet2 = 1,
LittleBigPlanet3 = 2,
Unknown = 3,
LittleBigPlanetVita = 1,
Unknown = -1,
}
}