Normal support for b1.7.3 assets #310
Open
+115
−77
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Contributor
Vimd0
commented
Jan 30, 2026
Vimd0
commented
- Added missing b1.7.3 util related stuff (item and texture names)
- Grass side overlay doesn't need a patch texture anymore
- Added pocket patches for camera, roses, and crying obsidian
BrentDaMage
requested changes
Jan 30, 2026
source/world/item/Item.cpp
Outdated
| ->handEquipped(); | ||
|
|
||
| Item::pickAxe_emerald = NEW_ITEM(ITEM_PICKAXE_EMERALD) | ||
| Item::diamondPickaxe = NEW_ITEM(ITEM_PICKAXE_DIAMOND) |
Collaborator
There was a problem hiding this comment.
Wrong order, the name should be ordered like the item ID and descriptionId. Same goes for everything else.
Contributor
Author
There was a problem hiding this comment.
just restored old names
Collaborator
There was a problem hiding this comment.
I'm not even opposed to you updating the names, I think it makes sense. I just think the word order of the names should match the texture ID enum name and the descriptionId.
However, I think it belongs in a separate PR.
source/world/tile/Tile.cpp
Outdated
| ->setDescriptionId("stairsWood"); | ||
|
|
||
| Tile::emeraldOre = (new OreTile(TILE_ORE_EMERALD, TEXTURE_ORE_EMERALD)) | ||
| Tile::diamondOre = (new OreTile(TILE_ORE_DIAMOND, TEXTURE_ORE_DIAMOND)) |
Collaborator
There was a problem hiding this comment.
Make these match descriptionIds.
Contributor
Author
There was a problem hiding this comment.
just restored old names
BrentDaMage
requested changes
Jan 30, 2026
| bool bDisableFancyGrassIfFailed = false; | ||
|
|
||
| // got the magic value, we can determine whether to disable fancy pants grass if the file doesn't exist | ||
| if (pd.m_destX == 1600 && pd.m_destY == 1600 && pd.m_type == TYPE_TERRAIN) |
Collaborator
There was a problem hiding this comment.
I thought you said you removed this? I don't think this is needed.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.