-
Notifications
You must be signed in to change notification settings - Fork 31
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.
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
Add Models/Textures/Mapped Images Validation Checks #2577
Open
DevGeniusCode
wants to merge
20
commits into
TheSuperHackers:main
Choose a base branch
from
DevGeniusCode:validate-mapped-images-and-assets
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 16 commits
Commits
Show all changes
20 commits
Select commit
Hold shift + click to select a range
9dc2fb8
Add missing texture and TGA validation checks
DevGeniusCode 86712b1
adds support for DDS files in the TGA validation, comparing files by …
DevGeniusCode 2f7745e
Optimized the script for better performance and readability
DevGeniusCode 80400e9
Added functionality to check for invalid textures in W3D files
DevGeniusCode 298d525
fix file name
DevGeniusCode f5534ba
fix output files name
DevGeniusCode c4fcc0a
Optimized code and updated various functions/variables names for bett…
DevGeniusCode a61c115
Add validation for invalid/unused textures/images and interactive menu
DevGeniusCode ddf3c35
fix Object_Folder regex
DevGeniusCode fbd6774
Improved the file names and added check assets in game.dat
DevGeniusCode e63606b
fix main menu
DevGeniusCode 0f96a09
fix main menu and update txt reports
DevGeniusCode 202b60a
add SCPatchUserInterface512.INI
DevGeniusCode 51bf275
Separation of textures and models, improved reports.
DevGeniusCode 2077b8d
Separation of textures and models, improved reports.
DevGeniusCode 8e79471
fix script name and maps references and remove `ani` files
DevGeniusCode 50048ca
Add language-specific assets analysis and fix animation regex
DevGeniusCode 5824563
Added file extensions and improved naming.
DevGeniusCode c250078
Improve `extract_art_files_from_ini_files` and spelling
DevGeniusCode 58baefa
minor fix
DevGeniusCode File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
476 changes: 476 additions & 0 deletions
476
Patch104pZH/Design/Scripts/textures/find_mapped_images_and_textures_errors.py
Large diffs are not rendered by default.
Oops, something went wrong.
44 changes: 44 additions & 0 deletions
44
Patch104pZH/Design/Scripts/textures/generated_edited/duplicate_mapped_images.txt
This file contains 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| HandCreatedMappedImages.INI LoadPageHuge | ||
| HandCreatedMappedImages.INI SCCAttack | ||
| HandCreatedMappedImages.INI InGameUIAmericaBase | ||
| HandCreatedMappedImages.INI InGameUIChinaBase | ||
| HandCreatedMappedImages.INI InGameUIGLABase | ||
| HandCreatedMappedImages.INI America_ScoreScreen | ||
| HandCreatedMappedImages.INI GLA_ScoreScreen | ||
| HandCreatedMappedImages.INI China_ScoreScreen | ||
| HandCreatedMappedImages.INI MutiPlayer_ScoreScreen | ||
| HandCreatedMappedImages.INI MainMenuBackdrop | ||
| SCShellUserInterface512.INI FairPlay | ||
| SCSmShellUserInterface512.INI NuHelpbox-midleft | ||
| SCSmShellUserInterface512.INI NuHelpbox-top | ||
| SCSmShellUserInterface512.INI NuHelpbox-bottomright | ||
| SCSmShellUserInterface512.INI NuHelpbox-topright | ||
| SCSmShellUserInterface512.INI NuHelpbox-topleft | ||
| SCSmShellUserInterface512.INI NuHelpbox-bottommid | ||
| SCSmShellUserInterface512.INI Ruler | ||
| SCSmShellUserInterface512.INI NuHelpbox-midright | ||
| SCSmShellUserInterface512.INI NuHelpbox-middle | ||
| SCSmShellUserInterface512.INI NuHelpbox-bottomleft | ||
| SCSmShellUserInterface512.INI WindowGrid | ||
| SNUserInterface512.INI SNPStar018 | ||
| SNUserInterface512.INI SNPStar019 | ||
| SNUserInterface512.INI SNPStar020 | ||
| SNUserInterface512.INI SNPStar000 | ||
| SNUserInterface512.INI SNPStar001 | ||
| SNUserInterface512.INI SNPStar002 | ||
| SNUserInterface512.INI SNPStar003 | ||
| SNUserInterface512.INI SNPStar004 | ||
| SNUserInterface512.INI SNPStar005 | ||
| SNUserInterface512.INI SNPStar006 | ||
| SNUserInterface512.INI SNPStar007 | ||
| SNUserInterface512.INI SNPStar008 | ||
| SNUserInterface512.INI SNPStar009 | ||
| SNUserInterface512.INI SNPStar010 | ||
| SNUserInterface512.INI SNPStar011 | ||
| SNUserInterface512.INI SNPStar012 | ||
| SNUserInterface512.INI SNPStar013 | ||
| SNUserInterface512.INI SNPStar014 | ||
| SNUserInterface512.INI SNPStar015 | ||
| SNUserInterface512.INI SNPStar016 | ||
| SNUserInterface512.INI SNPStar017 | ||
| SUUserInterface512.INI SSRadarVanScan |
11 changes: 11 additions & 0 deletions
11
Patch104pZH/Design/Scripts/textures/generated_edited/invalid_mapped_images_in_ini_files.txt
This file contains 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| SABarButtonGen2IN | ||
| SABarButtonGen2ON | ||
| SCBigButton | ||
| SNBarButtonGen2IN | ||
| SNBarButtonGen2ON | ||
| SUBarButtonGen2IN | ||
| SUBarButtonGen2ON | ||
| SUMinMax | ||
| SUMinMaxH | ||
| SUMinMaxP | ||
| UnitBackgroundA |
50 changes: 50 additions & 0 deletions
50
Patch104pZH/Design/Scripts/textures/generated_edited/invalid_mapped_images_in_wnd_files.txt
This file contains 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,50 @@ | ||
| CheckBoxUseStatsChecked | ||
| CheckBoxUseStatsUnchecked | ||
| MarketingScreen | ||
| ProgressBarDisabledBarLeftEnd | ||
| ProgressBarDisabledBarRepeatingCenter | ||
| ProgressBarDisabledBarRightEnd | ||
| ProgressBarDisabledBarSmallRepeatingCenter | ||
| ProgressBarDisabledLeftEnd | ||
| ProgressBarDisabledRepeatingCenter | ||
| ProgressBarDisabledRightEnd | ||
| ProgressBarDisabledSmallRepeatingCenter | ||
| ProgressBarEnabledBarLeftEnd | ||
| ProgressBarEnabledBarRepeatingCenter | ||
| ProgressBarEnabledBarRightEnd | ||
| ProgressBarEnabledBarSmallRepeatingCenter | ||
| ProgressBarEnabledLeftEnd | ||
| ProgressBarEnabledRepeatingCenter | ||
| ProgressBarEnabledRightEnd | ||
| ProgressBarEnabledSmallRepeatingCenter | ||
| ProgressBarHiliteBarLeftEnd | ||
| ProgressBarHiliteBarRepeatingCenter | ||
| ProgressBarHiliteBarRightEnd | ||
| ProgressBarHiliteBarSmallRepeatingCenter | ||
| ProgressBarHiliteLeftEnd | ||
| ProgressBarHiliteRepeatingCenter | ||
| ProgressBarHiliteRightEnd | ||
| ProgressBarHiliteSmallRepeatingCenter | ||
| PushButtonDisabled | ||
| PushButtonEnabled | ||
| PushButtonHilite | ||
| PushButtonHiliteSelected | ||
| StaticTextDisabled | ||
| StaticTextEnabled | ||
| StaticTextHilite | ||
| VSliderDisabledBottomEnd | ||
| VSliderDisabledRepeatingCenter | ||
| VSliderDisabledSmallRepeatingCenter | ||
| VSliderDisabledTopEnd | ||
| VSliderEnabledBottomEnd | ||
| VSliderEnabledRepeatingCenter | ||
| VSliderEnabledSmallRepeatingCenter | ||
| VSliderEnabledTopEnd | ||
| VSliderHiliteBottomEnd | ||
| VSliderHiliteRepeatingCenter | ||
| VSliderHiliteSmallRepeatingCenter | ||
| VSliderHiliteTopEnd | ||
| VsliderThumbDisabled | ||
| VsliderThumbEnabled | ||
| VsliderThumbHilite | ||
| VsliderThumbHiliteSelected |
61 changes: 61 additions & 0 deletions
61
Patch104pZH/Design/Scripts/textures/generated_edited/invalid_models_in_ini_files.txt
This file contains 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,61 @@ | ||
| AIBlockTile | ||
| AICliffTile | ||
| AIOFCR_PFL | ||
| AIPathTile | ||
| AISearchCTile | ||
| AISearchOTile | ||
| AIWaterTile | ||
| AVBattShip_D | ||
| AVBattShip_D1 | ||
| CBChalet2_DSN | ||
| CBChalet2_DSNG | ||
| CBChalet2_ESN | ||
| CBChalet2_SN | ||
| CBChalet2_SNG | ||
| CBChalet3_DSN | ||
| CBChalet3_DSNG | ||
| CBChalet3_ESN | ||
| CBChalet3_RSN | ||
| CBChalet3_SN | ||
| CBChalet3_SNG | ||
| CBHangr02_DSNG | ||
| CBModis03_TR | ||
| CBModis03_TRD | ||
| CBTower02_DNS | ||
| CBTower02_GDNS | ||
| CBTower02_GDS | ||
| CBTower02_GNS | ||
| CBTower02_GS | ||
| CBTower02_NS | ||
| CBWBrdgeLArc_D | ||
| CBWBrdgeLArc_E | ||
| CBWBrdgeLArc_R | ||
| CBioRock_CR | ||
| CIBird | ||
| CINFCIV01_ADTA1 | ||
| CINFCIV01_ADTA2 | ||
| CINFCIV01_ADTA3 | ||
| CV8DropCN | ||
| CVCargobrn | ||
| CVCargobrn_D | ||
| CVCstcn | ||
| CVCstcn_D | ||
| CVHRSE_STN | ||
| NBNMissle_A3ENSS | ||
| NONE | ||
| NULL | ||
| None | ||
| PMLitPol01_D | ||
| PMLitPol02_D | ||
| PMburntcar2 | ||
| PSAirCarrier_NS | ||
| PSCarRapt_D1B | ||
| UBPalaceEGX_DSG | ||
| ZBRprBay_NS | ||
| ZBValvStat_DG | ||
| cbhangr02_DSNG | ||
| cvoxpl_STN | ||
| cvrksh_STN | ||
| cvrksh_WAL | ||
| cvsctr_STN | ||
| cvsctr_WAL |
22 changes: 22 additions & 0 deletions
22
Patch104pZH/Design/Scripts/textures/generated_edited/invalid_textures_in_ini_files.txt
This file contains 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| CBWBrdgeSt_ | ||
| EXDots | ||
| EXRedSmokePuff | ||
| EXSateliteHack1 | ||
| EXthunderRadar | ||
| EXthunderWave | ||
| GlassShard01 | ||
| None | ||
| SMUDGE | ||
| TLRock01 | ||
| TMCliff24a | ||
| TMSand06a | ||
| TMSand06c | ||
| TRStrtHoleCvr | ||
| TTGrasRock01a | ||
| TTGrasSand01a | ||
| TTSandRoad01a | ||
| TXGras02a | ||
| T_desert_A_01 | ||
| T_desert_A_02 | ||
| T_desert_A_03 | ||
| T_desert_A_04 | ||
18 changes: 18 additions & 0 deletions
18
...pZH/Design/Scripts/textures/generated_edited/invalid_textures_in_mapped_images_folder.txt
This file contains 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| America_ScoreScreen | ||
| COB2_BackgroundSM | ||
| COB2_FrameSM | ||
| China2_BackgroundSM | ||
| China2_Frame | ||
| China2_FrameSM | ||
| China_ScoreScreen | ||
| GLA2_BackgroundSM | ||
| GLA2_Frame | ||
| GLA2_FrameSM | ||
| GLA_ScoreScreen | ||
| GeneralsChallengeMapInterface | ||
| MainMenuBackdrop | ||
| MainMenuBlackBorder | ||
| MutiPlayer_ScoreScreen | ||
| Skirmish_Load | ||
| USAMissionDemoLoadScreen | ||
| loadpage |
1 change: 1 addition & 0 deletions
1
Patch104pZH/Design/Scripts/textures/generated_edited/invalid_textures_in_w3d_files.txt
This file contains 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| NBPwrPlant_E.W3D antSlab_D.tga |
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why is this not written as "EXthunderWave.tga" as per the original value in the INI file?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Since the comparison was always without suffixes, so I did not capture them, I will include the suffixes for the reports.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Would a "Texture.psd" also match for a "Texture.tga" ?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Indeed, assuming that
Mod Builderconverts it to dds/tgaThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Typically yes, but Mod Builder can also build a "Texture.psd" as "AnotherTexture.dds", and I assume the script will not catch that.
Perhaps it would be worthwhile to check against files in
Patch104pZH\.Build\RawBundleItems(the files generated before archiving into big files), but this would require building (all languages) before running the script and likely make it more complicated.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Will the
ModBundleOptionalItems.jsonfile be sufficient for processing?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Currently
ModBundleCoreItems.jsonandModBundleOptionalItems.json.You could try search through all files listed in
ModJsonFiles.jsonand find texture and model targets that are not*.ext. Perhaps that would suffice.