Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix AF+ item names for wallpaper/carpet #81

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix AF+ item names for wallpaper/carpet #81

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ACSE.Core/Items/ItemData.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ public static ItemType GetItemType(ushort id, SaveType saveType)
return ItemType.Item;
else if (id >= 0x2C00 && id <= 0x2C5F)
return ItemType.RaffleTicket;
else if ((id >= 0x2600 && id <= 0x2642) || (id >= 0x2700 && id <= 0x2742))
else if ((id >= 0x2600 && id <= 0x263F) || (id >= 0x2700 && id <= 0x273F))
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

DnM/Dongwu Senlin need their own case so that wallpapers and carpets added in later are categorized correctly.

return ItemType.WallpaperCarpet;
else if (id >= 0x2400 && id <= 0x24FF)
return ItemType.Clothes;
Expand Down
14 changes: 4 additions & 10 deletions ACSE.WinForms/Resources/DBNM_Plus_Items_en.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2127,15 +2127,15 @@
0x260F, Lunar Surface
0x2610, Sand Garden
0x2611, Spooky Carpet
0x2612, Western Desert
0x2612, Bathhouse Tile
0x2613, Green Rug
0x2614, Blue Flooring
0x2615, Regal Carpet
0x2616, Ranch Flooring
0x2617, Modern Tile
0x2618, Cabana Flooring
0x2619, Snowman Carpet
0x261A, Backyard Lawn
0x261A, Old Board Floor
0x261B, Music Room Floor
0x261C, Plaza Tile
0x261D, Kitchen Tile
Expand Down Expand Up @@ -2173,9 +2173,6 @@
0x263D, Playroom Rug
0x263E, Kitschy Tile
0x263F, Diner Tile
0x2640, Block Flooring
0x2641, Boxing Ring Mat
0x2642, Harvest Rug
0x2700, Chic Wall
0x2701, Classic Wall
0x2702, Parlor Wall
Expand All @@ -2194,15 +2191,15 @@
0x270F, Lunar Horizon
0x2710, Garden Wall
0x2711, Spooky Wall
0x2712, Western Vista
0x2712, Bathhouse Wall
0x2713, Green Wall
0x2714, Blue Wall
0x2715, Regal Wall
0x2716, Ranch Wall
0x2717, Modern Wall
0x2718, Cabana Wall
0x2719, Snowman Wall
0x271A, Backyard Fence
0x271A, Worn-Out Mud Wall
0x271B, Music Room Wall
0x271C, Plaza Wall
0x271D, Lattice Wall
Expand Down Expand Up @@ -2240,9 +2237,6 @@
0x273D, Playroom Wall
0x273E, Kitschy Wall
0x273F, Groovy Wall
0x2740, Mushroom Mural
0x2741, Ringside Seating
0x2742, Harvest Wall
0x2800, Apple
0x2801, Cherry Shirt
0x2802, Pear
Expand Down
4 changes: 2 additions & 2 deletions ACSE.WinForms/Resources/DBNM_e_Plus_Items_en.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2214,7 +2214,7 @@
0x2641, Boxing Ring Mat
0x2642, Harvest Rug
0x2643, Bathhouse Tile
0x2644, Japanese Floor
0x2644, Old Board Floor
0x2700, Chic Wall
0x2701, Classic Wall
0x2702, Parlor Wall
Expand Down Expand Up @@ -2283,7 +2283,7 @@
0x2741, Ringside Seating
0x2742, Harvest Wall
0x2743, Bathhouse Wall
0x2744, Japanese Wall
0x2744, Worn-Out Mud Wall
0x2800, Apple
0x2801, Cherry
0x2802, Pear
Expand Down