StardewValley
/
SMAPI
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #681 from Mizzion/develop 

Fixed the ring issue and flooring
This commit is contained in:
Jesse Plamondon-Willard 2019-12-22 10:58:05 -05:00 committed by GitHub
parent 082f285bc7 89de36534d
commit 05d237400c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/SMAPI.Mods.ConsoleCommands/Framework/ItemRepository.cs
View File

@ -51,7 +51,7 @@ namespace StardewModdingAPI.Mods.ConsoleCommands.Framework
yield return this.TryCreate(ItemType.Wallpaper, id, () => new Wallpaper(id) { Category = SObject.furnitureCategory }); yield return this.TryCreate(ItemType.Wallpaper, id, () => new Wallpaper(id) { Category = SObject.furnitureCategory });
// flooring // flooring
for (int id = 0; id < 40; id++) for (int id = 0; id < 56; id++)
yield return this.TryCreate(ItemType.Flooring, id, () => new Wallpaper(id, isFloor: true) { Category = SObject.furnitureCategory }); yield return this.TryCreate(ItemType.Flooring, id, () => new Wallpaper(id, isFloor: true) { Category = SObject.furnitureCategory });
// equipment // equipment
@ -61,7 +61,7 @@ namespace StardewModdingAPI.Mods.ConsoleCommands.Framework
yield return this.TryCreate(ItemType.Hat, id, () => new Hat(id)); yield return this.TryCreate(ItemType.Hat, id, () => new Hat(id));
foreach (int id in Game1.objectInformation.Keys) foreach (int id in Game1.objectInformation.Keys)
{ {
if (id >= Ring.ringLowerIndexRange && id <= Ring.ringUpperIndexRange) if ((id >= Ring.ringLowerIndexRange && id <= Ring.ringUpperIndexRange) || (id >= 810 && id <= 811))
yield return this.TryCreate(ItemType.Ring, id, () => new Ring(id)); yield return this.TryCreate(ItemType.Ring, id, () => new Ring(id));
} }
@ -103,7 +103,7 @@ namespace StardewModdingAPI.Mods.ConsoleCommands.Framework
{ {
if (id == 79) if (id == 79)
continue; // secret note handled above continue; // secret note handled above
if (id >= Ring.ringLowerIndexRange && id <= Ring.ringUpperIndexRange) if ((id >= Ring.ringLowerIndexRange && id <= Ring.ringUpperIndexRange) || (id >= 810 && id <= 811))
continue; // handled separated continue; // handled separated
// spawn main item // spawn main item