Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Anuken
2024-03-15 14:14:59 -04:00
parent 5365014d4f 0311cfd275
commit 97f72b8c6b
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/src/mindustry/ctype/UnlockableContent.java
View File

@@ -43,6 +43,8 @@ public abstract class UnlockableContent extends MappableContent{
public TextureRegion uiIcon; public TextureRegion uiIcon;
/** Icon of the full content. Unscaled.*/ /** Icon of the full content. Unscaled.*/
public TextureRegion fullIcon; public TextureRegion fullIcon;
/** Override for the full icon. Useful for mod content with duplicate icons. Overrides any other full icon.*/
public String fullOverride = "";
/** The tech tree node for this content, if applicable. Null if not part of a tech tree. */ /** The tech tree node for this content, if applicable. Null if not part of a tech tree. */
public @Nullable TechNode techNode; public @Nullable TechNode techNode;
/** Tech nodes for all trees that this content is part of. */ /** Tech nodes for all trees that this content is part of. */
@@ -62,11 +64,12 @@ public abstract class UnlockableContent extends MappableContent{
@Override @Override
public void loadIcon(){ public void loadIcon(){
fullIcon = fullIcon =
Core.atlas.find(fullOverride,
Core.atlas.find(getContentType().name() + "-" + name + "-full", Core.atlas.find(getContentType().name() + "-" + name + "-full",
Core.atlas.find(name + "-full", Core.atlas.find(name + "-full",
Core.atlas.find(name, Core.atlas.find(name,
Core.atlas.find(getContentType().name() + "-" + name, Core.atlas.find(getContentType().name() + "-" + name,
Core.atlas.find(name + "1"))))); Core.atlas.find(name + "1"))))));
uiIcon = Core.atlas.find(getContentType().name() + "-" + name + "-ui", fullIcon); uiIcon = Core.atlas.find(getContentType().name() + "-" + name + "-ui", fullIcon);
} }