diff options
| author | Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com> | 2019-12-22 10:58:05 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-22 10:58:05 -0500 |
| commit | 05d237400c518d7ed288ddf2f5031913a9ca4af4 (patch) | |
| tree | fc10934b5cbff24652b77cf357855421188c0586 /src | |
| parent | 082f285bc7ce156ad0750bb48d46ed65a2e4aedb (diff) | |
| parent | 89de36534d1ce5361af2bb83a1b521e081c1dcf7 (diff) | |
| download | SMAPI-05d237400c518d7ed288ddf2f5031913a9ca4af4.tar.gz SMAPI-05d237400c518d7ed288ddf2f5031913a9ca4af4.tar.bz2 SMAPI-05d237400c518d7ed288ddf2f5031913a9ca4af4.zip | |
Merge pull request #681 from Mizzion/develop
Fixed the ring issue and flooring
Diffstat (limited to 'src')
| -rw-r--r-- | src/SMAPI.Mods.ConsoleCommands/Framework/ItemRepository.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/SMAPI.Mods.ConsoleCommands/Framework/ItemRepository.cs b/src/SMAPI.Mods.ConsoleCommands/Framework/ItemRepository.cs index 0648aa2b..1371d3a5 100644 --- a/src/SMAPI.Mods.ConsoleCommands/Framework/ItemRepository.cs +++ b/src/SMAPI.Mods.ConsoleCommands/Framework/ItemRepository.cs @@ -51,7 +51,7 @@ namespace StardewModdingAPI.Mods.ConsoleCommands.Framework yield return this.TryCreate(ItemType.Wallpaper, id, () => new Wallpaper(id) { Category = SObject.furnitureCategory }); // 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 }); // equipment @@ -61,7 +61,7 @@ namespace StardewModdingAPI.Mods.ConsoleCommands.Framework yield return this.TryCreate(ItemType.Hat, id, () => new Hat(id)); 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)); } @@ -103,7 +103,7 @@ namespace StardewModdingAPI.Mods.ConsoleCommands.Framework { if (id == 79) 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 // spawn main item |