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

Add mattb325:commercial-collection and mattb325:commercial-w2w-collection #46

Merged
merged 40 commits into from
Jan 17, 2025

Conversation

sebamarynissen
Copy link
Contributor

This PR adds mattb325's commercial pack and commercial w2w pack.

One thing to note: the spar-distribution-cs package is bugged on SC4Evermore because it includes and I-HT desc, while the lot references another desc file. I will notify the SC4E staff about this, but I've been able to fix it in this package by using the files from Simtropolis instead.

image

image

image

@sebamarynissen sebamarynissen marked this pull request as draft December 29, 2024 09:31
@sebamarynissen
Copy link
Contributor Author

sebamarynissen commented Jan 2, 2025

@memo33 I've given this one the dependency treatment as well. It's the usual suspects that got eliminated as with the other packages. I'd say this is ready for review now.

I've also added both the darknite and maxisnite urls. I would also like to add the Simtropolis urls where possible - so that it will show a button "Install with sc4pac" on the STEX as well for those ones that are available there too, but I'm still looking for a way to automate this. Matt has way too many content on the STEX (15 pages!) to do all of this manually. I'll keep this for a separate PR.

@sebamarynissen sebamarynissen marked this pull request as ready for review January 2, 2025 17:17
@sebamarynissen
Copy link
Contributor Author

I've found a way to automate a large part of it, converting back to draft so that I can include it.

@sebamarynissen sebamarynissen marked this pull request as draft January 2, 2025 18:15
@sebamarynissen sebamarynissen marked this pull request as ready for review January 2, 2025 18:53
@sebamarynissen
Copy link
Contributor Author

Allright, I added a bunch of websites. I'm probably going to add all of mattb325's content that's on the STEX as well, and then I'll look for duplicate files to figure out which ones were already included in the SC4E legacy packs.

@sebamarynissen
Copy link
Contributor Author

@memo33 Is there anything holding this back from getting merged? I'm currently backfilling matt's missing content in the Simtropolis channel, so it would be useful to have this merged so that the ST channel detects what content is already available in the default channel.

Copy link
Owner

@memo33 memo33 left a comment

Choose a reason for hiding this comment

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

Just limited time on my part.

Anyways, the rest looks good to me. Thanks a lot for the addition.

src/yaml/mattb325/spar-distribution.yaml Outdated Show resolved Hide resolved
@sebamarynissen sebamarynissen changed the title Add mattb325:commercial-pack and mattb325:commercial-w2w-pack Add mattb325:commercial-collection and mattb325:commercial-w2w-collection Jan 16, 2025
@memo33 memo33 force-pushed the feature/mattb-commerical branch from a4ec25c to 485db4b Compare January 17, 2025 06:36
@memo33 memo33 merged commit ffc27c3 into memo33:main Jan 17, 2025
3 checks passed
@memo33
Copy link
Owner

memo33 commented Jan 17, 2025

Thank you.

sebamarynissen added a commit to sebamarynissen/simtropolis-channel that referenced this pull request Jan 17, 2025
We've removed a bunch of packages that are already available in memo33/sc4pac#46
@sebamarynissen sebamarynissen deleted the feature/mattb-commerical branch January 17, 2025 10:19
sebamarynissen added a commit to sebamarynissen/simtropolis-channel that referenced this pull request Jan 17, 2025
* Add page 1

* Don't process packages already available

* Allow overriding local packages

* Add page 2

* Update 18253-blam-overpath-props-volume-1.yaml

* Update sc4d.js

* Create 29148-london-bridge-quarter-the-shard-and-place.yaml

* Add `xyloxadoria:6th-and-brushy`

* Esnure simfox day-and-nite is not included

* Add page 3

* Remove diggis ponds in favor of default channel

* Update sc4d.js

* Add page 4

* Create 34230-chinatown-road-avenue-and-pedestrian-lane-canopies.yaml

* Add page 5

* Update sc4d.js

* Add page 6

* Add page 7

* Update parse-dependencies.js

* Add page 8

* Add  page 9

* Add page 10

* Add page 11

* Add page 12

* Create 31893-car-ferry-terminal.yaml

* Update 31893-car-ferry-terminal.yaml

* Add page 13

* Add page 14

* Add page 15

* Create 27975-old-market-hall.yaml

* Fix missing subfolders

* Improve auto-detection of maxis and dark nite

* Fix MN/DN variants

* Fix MN/DN

* Fix model path too long

* Fix duplicate pwn-london

* Remove duplicates

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.

* Include filename when traversing

* Remove duplicates

We've removed a bunch of packages that are already available in memo33/sc4pac#46

* Remove duplicate

* Update sc4d.js

* Remove duplicates

Some packages were removed that are already present on the default channel.

* Fix exclusion pattern

* Delete 33006-diagonal-rail-glr-bus-and-subway-stations.yaml

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

Successfully merging this pull request may close these issues.

2 participants