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.

Sign up for GitHub

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

Jump to bottom

Ability to use zip or 7z archives instead of MPQs #32

Closed
Torphedo opened this issue Mar 23, 2022 · 5 comments
Closed

Ability to use zip or 7z archives instead of MPQs #32

Torphedo opened this issue Mar 23, 2022 · 5 comments

Comments

@Torphedo
Copy link
Contributor

I'll probably take a crack at this myself later, but I figured I'd open a formal issue in the meantime. It would be really useful to be able to package mods as 7z or zip files, and would probably reduce confusion. I know there's tooling for MPQs, but it's just an extra unecessary step. From what I've read, the main reason it's using MPQs is because using a Blizzard archive format is funny, which is...kind of a terrible reason.
@Torphedo
Copy link
Contributor Author

Torphedo commented Mar 23, 2022 •
edited
Loading

Updating this with info from Kenix:
"If someone wants to PR it, go for it, but your zip implementation must support patch archives. It won't be accepted otherwise. This is why we use MPQs and not zips. Patch archives will serve up the data from the most recently loaded archive based on the name."

"[raw] File system is not currently supported because we made one reference implement, and raw file system was not ideal because it's harder for mod authors to distribute. The requirements we gave ourselves are compresses to one file for easy mod distribution and patchable so that the engine can figure out the newest asset."

Essentially, it needs to be able to load multiple mods over each other based on some sort of priority system. My inclination is to have an install mod button, which would put the mod file in a mods folder and rename it to start with a number (eg. 100_MyMod.zip being priority 100).

@MegaMech
Copy link
Contributor

MegaMech commented Mar 23, 2022 •
edited
Loading

I don't think this is worth your time to implement. We have a solid working implementation and supporting.zip is just reimplementing the same thing again with a different name.

The mpq syatem has a lot of features

@MegaMech MegaMech changed the title [Feature Request] Ability to use 7z archives instead of MPQs Ability to use zip or 7z archives instead of MPQs Mar 23, 2022
@Torphedo
Copy link
Contributor Author

That's fair, now that the dust has settled a bit I have less of a desire to implement it. Might try in the future, we'll see.

@MegaMech
Copy link
Contributor

If you're considering contributing there are lots of areas we could use help with. The one click mod install idea you mentioned sounds cool (I don't know how the patching system works)

@Torphedo
Copy link
Contributor Author

Yeah, a mod install button seems like the best place to start. Zip support is a lower priority for me at this point

MelonSpeedruns referenced this issue in MelonSpeedruns/Shipwright Mar 31, 2022
@NEstelami
Merge pull request #32 from KiritoDv/master
b339666 
Added command hint
aMannus referenced this issue in aMannus/Shipwright Sep 23, 2022
@dcvz
Add no UI functionality (#32)
8503b26
briaguya-ai added a commit that referenced this issue Sep 28, 2022
@dcvz @Baoulettes
@aMannus @briaguya-ai
Feature: Crowd Control Integration (#1568)
083ceb4 
* Start effects

* Disable input to game when typing in console

* Add gravity support

* noUI placeholder

* Add rest of effects to console

* Remove z_play code

* Add rupee modification

* Add OneHit KO (#27)

* few fix and paper Link

* Better method and now use the reset flag

* Revert "Better method and now use the reset flag"

This reverts commit 2aafcc1.

* Revert "few fix and paper Link"

This reverts commit 65e76dc.

* Paper Link & few fixes (#28)

* Implement pacifist mode (#30)

* Implement cucco storm (#31)

* Add no UI functionality (#32)

* Enable CrowdControl on windows (#33)

* Use std::format and implement wallmaster

* Implement defense modifier

* Implement no_z and clean up

* Implement reverse controls

* Some fixes while testing CC connection

* Implement speed modifier and fix defese modifier

* Fail magic effects if magic is not acquired

* Fix queue system

* Implement rainstorm

* Some cleanup

* Use IS_ZERO to handle very low near zero values

* Split some effects

* Fix emptying magic

* Don’t run cucco on pre-rendered backgrounds

* Use correct method for updating ruppees

* Fix decreasing speed

* Remove old SDL stuff

* Remove old fixes

* Enable Crowd Control for both debug and release

* Add missing returns

* Cleanup event firing

* Further clean up on event firing

* Fix some bugs

* CC fixes and enemy spawning (#35)

* Fix icetraps

* Fix title screen

* Fix pause screen

* Fix death screen timer & Code cleanup

* Fix timer during textboxes

* Code cleanup

* Add: Multiple enemy spawning

* More enemies + more code cleanup (#36)

* Enums for returning effect states

* Add more enemies

* Update CrowdControl.cpp

* Remove enums from enemies

* Fix up flow for events (#37)

# Conflicts:
#	soh/soh/Enhancements/crowd-control/CrowdControl.cpp

* Fix spawn position of likelike

* CC temp enemy fixes (#38)

* Check for pause in pacifist and allow button presses (#39)

* Fix Pacifist mode (#41)

* First attempt pacifier fix

* Real fix for pacifist mode

* Comment

* Remove cutscene and long delay from cucco_storm (#40)

* Some PR Fixes

* Use standard types

* Handle JSON parsing error and free memory

* Add CC configuration file

* Add: Giving deku shield option. Fix: Giant Lonk (#42)

* Small stalfos fix (#43)

* Syntax Improvements (#44)

* Revert bools to uint32_t

* Add comment about bools

* Fix cucco storm, fix empty heart (#45)

* Protect commands vector with mutex

* prefix effects with chaosEffect (#46)

Co-authored-by: briaguya <briaguya@alice>

Co-authored-by: Baoulettes <perlouzerie@hotmail.fr>
Co-authored-by: aMannus <mannusmenting@gmail.com>
Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com>
Co-authored-by: briaguya <briaguya@alice>
Kenix3 pushed a commit to Kenix3/Shipwright that referenced this issue Oct 19, 2022
@dcvz @Baoulettes
@aMannus @briaguya-ai @Kenix3
Feature: Crowd Control Integration (HarbourMasters#1568)
edc7a91 
* Start effects

* Disable input to game when typing in console

* Add gravity support

* noUI placeholder

* Add rest of effects to console

* Remove z_play code

* Add rupee modification

* Add OneHit KO (HarbourMasters#27)

* few fix and paper Link

* Better method and now use the reset flag

* Revert "Better method and now use the reset flag"

This reverts commit 2aafcc1.

* Revert "few fix and paper Link"

This reverts commit 65e76dc.

* Paper Link & few fixes (HarbourMasters#28)

* Implement pacifist mode (HarbourMasters#30)

* Implement cucco storm (HarbourMasters#31)

* Add no UI functionality (HarbourMasters#32)

* Enable CrowdControl on windows (HarbourMasters#33)

* Use std::format and implement wallmaster

* Implement defense modifier

* Implement no_z and clean up

* Implement reverse controls

* Some fixes while testing CC connection

* Implement speed modifier and fix defese modifier

* Fail magic effects if magic is not acquired

* Fix queue system

* Implement rainstorm

* Some cleanup

* Use IS_ZERO to handle very low near zero values

* Split some effects

* Fix emptying magic

* Don’t run cucco on pre-rendered backgrounds

* Use correct method for updating ruppees

* Fix decreasing speed

* Remove old SDL stuff

* Remove old fixes

* Enable Crowd Control for both debug and release

* Add missing returns

* Cleanup event firing

* Further clean up on event firing

* Fix some bugs

* CC fixes and enemy spawning (HarbourMasters#35)

* Fix icetraps

* Fix title screen

* Fix pause screen

* Fix death screen timer & Code cleanup

* Fix timer during textboxes

* Code cleanup

* Add: Multiple enemy spawning

* More enemies + more code cleanup (HarbourMasters#36)

* Enums for returning effect states

* Add more enemies

* Update CrowdControl.cpp

* Remove enums from enemies

* Fix up flow for events (HarbourMasters#37)

# Conflicts:
#	soh/soh/Enhancements/crowd-control/CrowdControl.cpp

* Fix spawn position of likelike

* CC temp enemy fixes (HarbourMasters#38)

* Check for pause in pacifist and allow button presses (HarbourMasters#39)

* Fix Pacifist mode (HarbourMasters#41)

* First attempt pacifier fix

* Real fix for pacifist mode

* Comment

* Remove cutscene and long delay from cucco_storm (HarbourMasters#40)

* Some PR Fixes

* Use standard types

* Handle JSON parsing error and free memory

* Add CC configuration file

* Add: Giving deku shield option. Fix: Giant Lonk (HarbourMasters#42)

* Small stalfos fix (HarbourMasters#43)

* Syntax Improvements (HarbourMasters#44)

* Revert bools to uint32_t

* Add comment about bools

* Fix cucco storm, fix empty heart (HarbourMasters#45)

* Protect commands vector with mutex

* prefix effects with chaosEffect (HarbourMasters#46)

Co-authored-by: briaguya <briaguya@alice>

Co-authored-by: Baoulettes <perlouzerie@hotmail.fr>
Co-authored-by: aMannus <mannusmenting@gmail.com>
Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com>
Co-authored-by: briaguya <briaguya@alice>
lilacLunatic pushed a commit to lilacLunatic/Shipwright that referenced this issue Dec 16, 2022
@garrettjoecox
Merge pull request HarbourMasters#32 from Archez/fix-entrance-vanilla…
c4962e5 
…-logic

Fix entrance rando in vanilla logic and vanilla option overrides
Kenix3 pushed a commit that referenced this issue Apr 26, 2023
@NEstelami
HD Skeleton Swapping and Language Fixes (#32)
0d7920d 
* Yes.

* HD Skeleton Swapping and Language Fixes

* Test
briaguya-ai added a commit that referenced this issue Apr 27, 2023
@briaguya-ai @NEstelami
@dcvz @Kenix3 @KiritoDv @stratomaster64 @MelonSpeedruns @Archez @inspectredc @Patrick12115 @Rozelette @leggettc18
spockalicious (#2751)
4166dbf 
* Rough mockup of LUS XML loading

* Updated code for merge

* Loading from FS support and custom DList WIP implementation

* Added current directory support to F3D and impl most of the dlist cmds

* WIP Skeleton support

* Almost done

* Rebase fixes

* Submodule updates

* HD Texture Support

* Fixes

* bump lus

* fix exporter build, header update

* soh builds

* setMesh image path cleanup

* Update soh/src/overlays/actors/ovl_player_actor/z_player.c

* Update soh/src/overlays/actors/ovl_player_actor/z_player.c

* Update OTRExporter/OTRExporter/Main.cpp

* Update ZAPDTR/ZAPD/ZResource.h

* Update soh/src/code/z_skelanime.c

* Update OTRExporter/OTRExporter/Main.cpp

* Fixed jpeg backgrounds and decreased icon buffer size

* Bump lus

* Increased even more the buffer because it crashes on long texts

* Removed print because sometimes the if is not triggered when the image is already byteswapped

* fix non-windows build

* fix build

Co-authored-by: Kenix <kenixwhisperwind@gmail.com>

* add hd checkbox

* Various fixes for custom model support (#23)

* Some fixes

* Updated LUS Version

* Fixed issue with Link Skirt on pause menu

* Added CVar for custom link model changes

* Fixed headers

* Additional header fixes

* Tweaks

* Unload HD game assets on scene transition. (#16)

* Unload game assets on scene transition.

* Bump LUS

* Unloads all HD assets on scene transition.

* Only unload hd assets if hd assets are turned on.

* Fixes issues on toggling between HD and non HD assets.

---------

Co-authored-by: briaguya <briaguya@alice>

* fix: actually load hd debug font (#27)

* fix: actually load hd debug font

* toggle debug text correctly

---------

Co-authored-by: briaguya <briaguya>

* Yes. (#28)

* Merge branch 'develop' into dev-to-ghost

* HD Skeleton Swapping and Language Fixes (#32)

* Yes.

* HD Skeleton Swapping and Language Fixes

* Test

* Fixed issues with ganon cape (#34)

* Fixed Bongo Bongo Crash (#35)

* Added HD Assets Toggle (#37)

* Ivan the Fairy - Coop Mode (#36)

* wip

* hookshotable ivan

* added hookshot item

* new items & changes & fixes & restored navi

* farore, din and nayru's spells are done

* fixed slingshot & bow

* added more items supported

* done with all main items

* bug fixes & ready

* added imgui button

* wip

* hookshotable ivan

* added hookshot item

* new items & changes & fixes & restored navi

* farore, din and nayru's spells are done

* fixed slingshot & bow

* added more items supported

* fix own dungeon items on shuffled boss rooms (#2683)

* bump lus (#2692)

* fix: lowercase package names for vcpkg (#2693)

vcpkg was throwing an error `error: invalid character in package name (must be lowercase, digits, '-')`
this updates our calls to `vcpkg_install_packages` to use lowercase package names instead of uppercase

* fix death mountain cloud in rando (#2691)

* Fix: Switch Age No Longer Reloads Start Room (#2679)

* [Reduced Clutter] Disable Hot/Underwater Warning Text (#2684)

* Disable Warning Text

* Moved to Reduced Clutter

* done with all main items

* bug fixes & ready

* fix: process roms in consistent order (#2696)

* chore: move rando savefile setup and document flags (#2697)

* remove rando save init from sram

* move rando savefile init logic and set more flags

* document flags for rando save creation

* Fix: Use correct fps value for frame interpolation with match refresh rate (#2694)

* Fix: Kak GS placement on construction site (#2695)

* added imgui button

* addressed kenix's comments

* fixed useless null

* added rupee dash mode in extra modes

* changed menu position

---------

Co-authored-by: Adam Bird <Archez@users.noreply.github.com>
Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com>
Co-authored-by: inspectredc <78732756+inspectredc@users.noreply.github.com>
Co-authored-by: Patrick12115 <115201185+Patrick12115@users.noreply.github.com>

* LUS Scancodes (#42)

* Added HD Assets Toggle

* Switched out SDL for LUS scancodes

* Ivan tweaks (#45)

* Magic consumption slowed down;
Bosses now affected by Ivan's Din spell

* Adjust magic timer

* clean up imgui

* model fixes/improvements (#50)

* replace `gUseCustomLinkModel` with custom resource check

* handle adult/child

* bump lus

* fix model switching with tab

* use lus main

* fix carpet man (#52)

Co-authored-by: Rozelette <Rozelette@users.noreply.github.com>

* get ship model and lus texture into soh.otr, use `gAuthenticLogo` to toggle between ship and authentic (#55)

* Use libultra features for CPU-modified textures (#40)

* Use libultra features for CPU-modified textures

* Comment

* bump lus on ghost (#58)

* fix: properly use `Interface_LoadActionLabel` to display start button text (#61)

* Changes hd -> alt for texture replacement. (#65)

* Changes hd -> alt for texture replacement.

* Renames variables in gfxprint for hd -> alt change.

* Update soh/soh/resource/type/Skeleton.cpp

---------

Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com>

* Fixes kaleido dungeon maps (#67)

* skeleton stuff (#69)

* comment out wii u build (#70)

* bump lus (#71)

* Rework readme (#72)

* Update README.md

* docs

* put custom music docs somewhere

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* dark/light title image

* lus

* Update README.md

* Fixed vanilla minimap (#73)

* Fixed vanilla minimap

* Workaround for pulsing SD maps with non-broken HD maps.

---------

Co-authored-by: Christopher Leggett <chris@leggett.dev>

* Skeleton fix fixed (#75)

* WIP skelton patcher fix

* Fixes skeleton reference change.

* Adds const back to name in ResourceMgr_LoadSkeletonByName

---------

Co-authored-by: Christopher Leggett <chris@leggett.dev>
Co-authored-by: Kenix <kenixwhisperwind@gmail.com>

* Fixes z_message_otr memory leak.

* Update soh/soh/z_message_OTR.cpp

* Update soh/src/code/game.c

* docs: add how to find otr files to switch instructions (#78)

* bump lus (#79)

* comment out RegisterBlendedTexture in king d (#80)

---------

Co-authored-by: Nicholas Estelami <NEstelami@users.noreply.github.com>
Co-authored-by: David Chavez <david@dcvz.io>
Co-authored-by: briaguya <briaguya@alice>
Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com>
Co-authored-by: KiritoDv <kiritodev01@gmail.com>
Co-authored-by: briaguya <briaguya>
Co-authored-by: Ralphie Morell <stratomaster64@gmail.com>
Co-authored-by: MelonSpeedruns <melonspeedruns@outlook.com>
Co-authored-by: Adam Bird <Archez@users.noreply.github.com>
Co-authored-by: inspectredc <78732756+inspectredc@users.noreply.github.com>
Co-authored-by: Patrick12115 <115201185+Patrick12115@users.noreply.github.com>
Co-authored-by: Rozelette <Rozelette@users.noreply.github.com>
Co-authored-by: Christopher Leggett <chris@leggett.dev>
Co-authored-by: Lywx <36680385+KiritoDv@users.noreply.github.com>
Sarge-117 pushed a commit to Sarge-117/Shipwright that referenced this issue Sep 12, 2023
@MelonSpeedruns
Merge pull request HarbourMasters#32 from PurpleHato/anchorplayerMode…
3b07501 
…lPurple

ADD: Magic bar on display info and a separator
Malkierian pushed a commit to Malkierian/Shipwright that referenced this issue Nov 20, 2023
@dcvz @Baoulettes
@aMannus @briaguya-ai
Feature: Crowd Control Integration (HarbourMasters#1568)
d3ec48f 
* Start effects

* Disable input to game when typing in console

* Add gravity support

* noUI placeholder

* Add rest of effects to console

* Remove z_play code

* Add rupee modification

* Add OneHit KO (HarbourMasters#27)

* few fix and paper Link

* Better method and now use the reset flag

* Revert "Better method and now use the reset flag"

This reverts commit 2aafcc1.

* Revert "few fix and paper Link"

This reverts commit 65e76dc.

* Paper Link & few fixes (HarbourMasters#28)

* Implement pacifist mode (HarbourMasters#30)

* Implement cucco storm (HarbourMasters#31)

* Add no UI functionality (HarbourMasters#32)

* Enable CrowdControl on windows (HarbourMasters#33)

* Use std::format and implement wallmaster

* Implement defense modifier

* Implement no_z and clean up

* Implement reverse controls

* Some fixes while testing CC connection

* Implement speed modifier and fix defese modifier

* Fail magic effects if magic is not acquired

* Fix queue system

* Implement rainstorm

* Some cleanup

* Use IS_ZERO to handle very low near zero values

* Split some effects

* Fix emptying magic

* Don’t run cucco on pre-rendered backgrounds

* Use correct method for updating ruppees

* Fix decreasing speed

* Remove old SDL stuff

* Remove old fixes

* Enable Crowd Control for both debug and release

* Add missing returns

* Cleanup event firing

* Further clean up on event firing

* Fix some bugs

* CC fixes and enemy spawning (HarbourMasters#35)

* Fix icetraps

* Fix title screen

* Fix pause screen

* Fix death screen timer & Code cleanup

* Fix timer during textboxes

* Code cleanup

* Add: Multiple enemy spawning

* More enemies + more code cleanup (HarbourMasters#36)

* Enums for returning effect states

* Add more enemies

* Update CrowdControl.cpp

* Remove enums from enemies

* Fix up flow for events (HarbourMasters#37)

# Conflicts:
#	soh/soh/Enhancements/crowd-control/CrowdControl.cpp

* Fix spawn position of likelike

* CC temp enemy fixes (HarbourMasters#38)

* Check for pause in pacifist and allow button presses (HarbourMasters#39)

* Fix Pacifist mode (HarbourMasters#41)

* First attempt pacifier fix

* Real fix for pacifist mode

* Comment

* Remove cutscene and long delay from cucco_storm (HarbourMasters#40)

* Some PR Fixes

* Use standard types

* Handle JSON parsing error and free memory

* Add CC configuration file

* Add: Giving deku shield option. Fix: Giant Lonk (HarbourMasters#42)

* Small stalfos fix (HarbourMasters#43)

* Syntax Improvements (HarbourMasters#44)

* Revert bools to uint32_t

* Add comment about bools

* Fix cucco storm, fix empty heart (HarbourMasters#45)

* Protect commands vector with mutex

* prefix effects with chaosEffect (HarbourMasters#46)

Co-authored-by: briaguya <briaguya@alice>

Co-authored-by: Baoulettes <perlouzerie@hotmail.fr>
Co-authored-by: aMannus <mannusmenting@gmail.com>
Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com>
Co-authored-by: briaguya <briaguya@alice>
Caladius referenced this issue in Caladius/Shipwright Jan 6, 2024
@aMannus
Merge pull request #32 from Caladius/potsanity_v1
532824e 
Potsanity MQ
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
2 participants
@MegaMech @Torphedo