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.

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

metadata: add mattb325's complete collection #80

Merged
merged 45 commits into from
Jan 17, 2025
Merged

Conversation

sebamarynissen
Copy link
Owner

This PR adds all of mattb325's content that was not yet available on the STEX.

image

image

Currently created as draft as there are probably some duplicates that are already added in memo33/sc4pac#46 and memo33/sc4pac#47, but which still need to be filtered out here.

We've removed a bunch of packages that are also included in memo33/sc4pac#47, so no need to put them on the ST channel too.
We've removed a bunch of packages that are already available in memo33/sc4pac#46
Some packages were removed that are already present on the default channel.
@sebamarynissen
Copy link
Owner Author

sebamarynissen commented Jan 17, 2025

@memo33 In order to filter out packages that are already available on the default channel, I installed all available mattb325 content and then ran a script that searches for duplicates in the plugins folder. This allowed to me to filter out the packages that shouldn't be included in this PR, but it also shows that there are other duplicates, outside the scope of this PR (see the log below). It's mainly related to certain packages being available as both commercial and civic, in which case the .SC4Model files are duplicated. What do you think we should do with them? Keep it as it is, or extract those shared resources into models dependencies?

Duplicates
┌─────────┬───────────┬─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┐
│ (index) │ hash      │ file                                                                                                                                                                    │
├─────────┼───────────┼─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┤
│ 0       │ 338753077 │ 100-props-textures\mattb325.commercial-collection-shared-resources.dark.1.0.sc4pac\C-Civic DN\Mattb325_17th_St-0x5ad0e817_0x89a7c7b2_0x30000.SC4Model                   │
│ 1       │           │ 620-education\mattb325.17th-st-washington-dc.dark.1.0.sc4pac\Mattb325_17th_St-0x5ad0e817_0x89a7c7b2_0x30000.SC4Model                                                    │
│ 2       │           │                                                                                                                                                                         │
│ 3       │ f2db89c47 │ 100-props-textures\mattb325.commercial-collection-shared-resources.dark.1.0.sc4pac\C-Civic DN\Mattb325_City_College-0x5ad0e817_0x6903288e_0x30000.SC4Model              │
│ 4       │           │ 620-education\mattb325.city-college.dark.1.0.sc4pac\Mattb325_City_College-0x5ad0e817_0x6903288e_0x30000.SC4Model                                                        │
│ 5       │           │                                                                                                                                                                         │
│ 6       │ ec247509a │ 100-props-textures\mattb325.commercial-collection-shared-resources.dark.1.0.sc4pac\C-Civic DN\Mattb325_Eddy_Hall-0x5ad0e817_0x420efd0_0x30000.SC4Model                  │
│ 7       │           │ 620-education\mattb325.eddy-hall.dark.1.0.sc4pac\Model Files KEEP ONLY ONE\Eddy_Hall_Dark_Nite\Mattb325_Eddy_Hall-0x5ad0e817_0x420efd0_0x30000.SC4Model                 │
│ 8       │           │                                                                                                                                                                         │
│ 9       │ bd6a1d019 │ 100-props-textures\mattb325.commercial-collection-shared-resources.dark.1.0.sc4pac\C-Civic DN\Mattb325_NationalGeographicSociety-0x5ad0e817_0x69cf6430_0x30000.SC4Model │
│ 10      │           │ 620-education\mattb325.national-geographic-society-hq.dark.1.0.sc4pac\Mattb325_NationalGeographicSociety-0x5ad0e817_0x69cf6430_0x30000.SC4Model                         │
│ 11      │           │                                                                                                                                                                         │
│ 12      │ 1a08db9fb │ 100-props-textures\mattb325.commercial-collection-shared-resources.dark.1.0.sc4pac\C-Civic DN\Mattb325_PWN_London-0x5ad0e817_0xc930be57_0x30000.SC4Model                │
│ 13      │           │ 630-health\mattb325.pwn-london.dark.1.0.0.sc4pac\Mattb325_PWN_London-0x5ad0e817_0xc930be57_0x30000.SC4Model                                                             │
│ 14      │           │                                                                                                                                                                         │
│ 15      │ 1fc8f9f91 │ 100-props-textures\mattb325.commercial-collection-shared-resources.dark.1.0.sc4pac\C-I DN\AustraliaPostTruckAutomata.dat                                                │
│ 16      │           │ 100-props-textures\mattb325.commercial-w2w-collection-shared-resources.dark.1.1.sc4pac\AustraliaPostTruckAutomata.dat                                                   │
│ 17      │           │ 100-props-textures\mattb325.industrial-pack-shared-resources.dark.1.0.sc4pac\C-I DN\AustraliaPostTruckAutomata.dat                                                      │
│ 18      │           │                                                                                                                                                                         │
│ 19      │ cba81804c │ 100-props-textures\mattb325.commercial-collection-shared-resources.dark.1.0.sc4pac\C-I DN\Mattb325_CanadianBitters-0x5ad0e817_0x4a827f6e_0x30000.SC4Model               │
│ 20      │           │ 100-props-textures\mattb325.commercial-w2w-collection-shared-resources.dark.1.1.sc4pac\Mattb325_CanadianBitters-0x5ad0e817_0x4a827f6e_0x30000.SC4Model                  │
│ 21      │           │ 100-props-textures\mattb325.industrial-pack-shared-resources.dark.1.0.sc4pac\C-I DN\Mattb325_CanadianBitters-0x5ad0e817_0x4a827f6e_0x30000.SC4Model                     │
│ 22      │           │                                                                                                                                                                         │
│ 23      │ 596c308bd │ 100-props-textures\mattb325.commercial-collection-shared-resources.dark.1.0.sc4pac\C-I DN\Mattb325_Post_Offices.dat                                                     │
│ 24      │           │ 100-props-textures\mattb325.commercial-w2w-collection-shared-resources.dark.1.1.sc4pac\Mattb325_Post_Offices.dat                                                        │
│ 25      │           │ 100-props-textures\mattb325.industrial-pack-shared-resources.dark.1.0.sc4pac\C-I DN\Mattb325_Post_Offices.dat                                                           │
│ 26      │           │                                                                                                                                                                         │
│ 27      │ 06fedcd1e │ 100-props-textures\mattb325.commercial-collection-shared-resources.dark.1.0.sc4pac\R-C\Mattb325_Lansdowne_Terrace.dat                                                   │
│ 28      │           │ 200-residential\mattb325.lansdowne-terrace.dark.1.2-1.sc4pac\Mattb325_Lansdowne_Terrace.dat                                                                             │
│ 29      │           │                                                                                                                                                                         │
│ 30      │ 37d33d771 │ 100-props-textures\mattb325.industrial-pack-shared-resources.dark.1.0.sc4pac\I-Civic DN\Mattb325_Disease_Research_Center-0x5ad0e817_0x1d2d3ba3_0x30000.SC4Model         │
│ 31      │           │ 600-civics\mattb325.disease-research-center.1.0.sc4pac\Mattb325_Disease_Research_Center-0x5ad0e817_0x1d2d3ba3_0x30000.SC4Model                                          │
│ 32      │           │                                                                                                                                                                         │
│ 33      │ f60c001ff │ 100-props-textures\mattb325.overhanging-multifunction-stations.dark.1.0.sc4pac\Mattb325_DiagStation-0x5ad0e817_0x88ff20c2_0x30000.SC4Model                              │
│ 34      │           │ 700-transit\mattb325.diagonal-rail-glr-bus-and-subway-stations.dark.1.0.sc4pac\Mattb325_DiagStation-0x5ad0e817_0x88ff20c2_0x30000.SC4Model                              │
│ 35      │           │                                                                                                                                                                         │
│ 36      │ 19c924ecb │ 200-residential\mattb325.dallas-apartments-tropical.1.0.0.sc4pac\Mattb325 Dallas Apartments-0x6534284a-0x3ec1db6a-0x3dcfe109.SC4Desc                                    │
│ 37      │           │ 200-residential\mattb325.dallas-apartments.dark.1.0.0.sc4pac\Mattb325 Dallas Apartments-0x6534284a-0x3ec1db6a-0x3dcfe109.SC4Desc                                        │
│ 38      │           │                                                                                                                                                                         │
│ 39      │ 91360b2a3 │ 200-residential\mattb325.saville-condos.dark.1.2.sc4pac\1x2\Mattb325_Saville_Condos(1)-0x6534284a-0x13a0bd51-0x9e2ab4ca.SC4Desc                                         │
│ 40      │           │ 200-residential\mattb325.saville-condos.dark.1.2.sc4pac\Mattb325_Saville_Condos(1)-0x6534284a-0x13a0bd51-0x9e2ab4ca.SC4Desc                                             │
│ 41      │           │                                                                                                                                                                         │
│ 42      │ 9598645d4 │ 200-residential\mattb325.saville-condos.dark.1.2.sc4pac\1x2\Mattb325_Saville_Condos(2)-0x6534284a-0x13a0bd51-0x7e2ab507.SC4Desc                                         │
│ 43      │           │ 200-residential\mattb325.saville-condos.dark.1.2.sc4pac\Mattb325_Saville_Condos(2)-0x6534284a-0x13a0bd51-0x7e2ab507.SC4Desc                                             │
│ 44      │           │                                                                                                                                                                         │
│ 45      │ cbbab2aff │ 200-residential\mattb325.saville-condos.dark.1.2.sc4pac\1x2\Mattb325_Saville_Condos-0x6534284a-0x13a0bd51-0xbe2ab419.SC4Desc                                            │
│ 46      │           │ 200-residential\mattb325.saville-condos.dark.1.2.sc4pac\Mattb325_Saville_Condos-0x6534284a-0x13a0bd51-0xbe2ab419.SC4Desc                                                │
│ 47      │           │                                                                                                                                                                         │
│ 48      │ bae5fd4e3 │ 200-residential\mattb325.saville-condos.dark.1.2.sc4pac\1x2\R$$5_1x2_Mattb325_Saville_Condos_0e2ab4b4.SC4Lot                                                            │
│ 49      │           │ 200-residential\mattb325.saville-condos.dark.1.2.sc4pac\R$$5_1x2_Mattb325_Saville_Condos_0e2ab4b4.SC4Lot                                                                │
│ 50      │           │                                                                                                                                                                         │
│ 51      │ 55e614652 │ 300-commercial\mattb325.17th-st-washington-dc-cs.dark.1.0.sc4pac\Mattb325 17th St CS$$-0x6534284a-0x3ec1db6a-0x59b50881.SC4Desc                                         │
│ 52      │           │ 620-education\mattb325.17th-st-washington-dc.dark.1.0.sc4pac\Mattb325 17th St CS$$-0x6534284a-0x3ec1db6a-0x59b50881.SC4Desc                                             │
│ 53      │           │                                                                                                                                                                         │
│ 54      │ ae4d2047f │ 300-commercial\mattb325.city-college-cs.dark.1.0.sc4pac\Mattb325_City_College(CS$$$)-0x6534284a-0x3ec1db6a-0x36ede961.SC4Desc                                           │
│ 55      │           │ 620-education\mattb325.city-college.dark.1.0.sc4pac\Mattb325_City_College(CS$$$)-0x6534284a-0x3ec1db6a-0x36ede961.SC4Desc                                               │
│ 56      │           │                                                                                                                                                                         │
│ 57      │ 3d5687d32 │ 300-commercial\mattb325.national-geographic-hq-cs.dark.1.0.sc4pac\Mattb325 Nat Geographic C$$-0x6534284a-0x3ec1db6a-0x99b66171.SC4Desc                                  │
│ 58      │           │ 620-education\mattb325.national-geographic-society-hq.dark.1.0.sc4pac\Mattb325 Nat Geographic C$$-0x6534284a-0x3ec1db6a-0x99b66171.SC4Desc                              │
│ 59      │           │                                                                                                                                                                         │
└─────────┴───────────┴─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘

@sebamarynissen sebamarynissen merged commit 9b7f373 into main Jan 17, 2025
2 checks passed
@sebamarynissen sebamarynissen deleted the feature/mattb325 branch January 17, 2025 12:39
@memo33
Copy link

memo33 commented Jan 21, 2025

What do you think we should do with them? Keep it as it is, or extract those shared resources into models dependencies?

Thanks for the list. I'm not sure what to do. It probably doesn't matter too much if we keep it as it is, as creating additional shared resource dependencies is some effort.

Especially the files in 100-props-textures are a bit surprising to me, as it looks like the same files are contained in different assets. I guess those would be installed in the same location when using the jar installers, but that doesn't work with sc4pac.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants