Commit Graph

395 Commits

Author SHA1 Message Date
Fabian Dill 909172cbad Factorio, Minecraft & Hollow Knight: add startinventory support 2021-05-09 21:22:21 +02:00
KonoTyran fa24fd31d0
re-added stuff (#7)
* add minecraft randomizer usage/installation tutorial

* update tutorial to specify Java edition of Minecraft to avoid confusion.

* fixed some grammar and spelling in the minecraft_en.md tutorial

* add minecraft randomizer usage/installation tutorial

* update tutorial to specify Java edition of Minecraft to avoid confusion.

* fixed some grammar and spelling in the minecraft_en.md tutorial

* update readme to relfect removal of name field from connect command.

* re-added explenations in yaml manualy wrapped the lines to stop them from looking weird on the web page.
2021-05-09 18:06:51 +02:00
KonoTyran eb02d65dbb
minecraft setup tutorial changes. (#6)
* add minecraft randomizer usage/installation tutorial

* update tutorial to specify Java edition of Minecraft to avoid confusion.

* fixed some grammar and spelling in the minecraft_en.md tutorial

* add minecraft randomizer usage/installation tutorial

* update tutorial to specify Java edition of Minecraft to avoid confusion.

* fixed some grammar and spelling in the minecraft_en.md tutorial

* update readme to relfect removal of name field from connect command.
2021-05-08 19:51:12 +02:00
Fabian Dill de2ead3a9b Embed Minecraft tutorial in menu 2021-05-03 12:30:09 +02:00
KonoTyran ff96b391b9
Mincraft Tutorial (#4)
* add minecraft randomizer usage/installation tutorial

* update tutorial to specify Java edition of Minecraft to avoid confusion.
2021-05-03 12:26:35 +02:00
Chris Wilson e8e141b206 Update copyright year on the WebHost to 2021 2021-04-29 20:09:10 -04:00
Fabian Dill 6d15aef88a Factorio: align tech tree sections in growing ingredient requirements 2021-04-10 18:45:11 +02:00
Fabian Dill ea15f221ae various fixes to WebHost 2021-04-10 15:26:30 +02:00
Fabian Dill 20b72369d8 allow basic WebHost functionality to work 2021-04-04 03:18:19 +02:00
Fabian Dill d24ee45462 Merge branch 'main' into Archipelago_Main
# Conflicts:
#	BaseClasses.py
#	LttPAdjuster.py
#	Main.py
#	Mystery.py
#	Utils.py
#	WebHostLib/generate.py
#	playerSettings.yaml
2021-04-01 11:44:37 +02:00
Fabian Dill dc73fa0f33 Factorio integration 2021-04-01 11:40:58 +02:00
CaitSith2 9233a7e208 name variable changes
* Convert %number%, %player% and %% to {number}, {player} and %.
* added {NUMBER} - output number if greater than 1.
* added {PLAYER}, output player slot number if greater than 1.
2021-03-28 16:52:32 -07:00
Fabian Dill 3d93f659e3 some option updates 2021-03-14 08:38:02 +01:00
Fabian Dill 03bcd2aed7 Merge branch 'main' into breaking_changes 2021-03-14 07:04:40 +01:00
Chris Wilson a305a0ffac Save filenames to yaml instead of sprite names, bump weighted settings version to 4.1.1 rev0 2021-03-13 18:53:53 -05:00
Fabian Dill 35285609e0 different default DB name for breaking_changes DB to avoid overlap 2021-03-13 23:36:57 +01:00
Fabian Dill 6455dc3ffc Merge branch 'main' into breaking_changes
# Conflicts:
#	README.md
2021-03-13 23:34:38 +01:00
Fabian Dill 6e129c3421 update spriteData.json 2021-03-13 01:56:31 +01:00
CaitSith2 b898803981 single player tracker now hides small key/big key column if everything in that column would be N/A. 2021-03-07 14:53:42 -08:00
CaitSith2 361460df26 Multiplayer tracker now shows big keys/small keys applicable to ALL players of that seed. 2021-03-07 14:30:21 -08:00
Fabian Dill f7dc21ddcc Merge branch 'main' into breaking_changes
# Conflicts:
#	Main.py
#	Utils.py
2021-03-07 22:04:06 +01:00
CaitSith2 a86238d741 Add actual tracking of player small keys/big keys 2021-03-06 13:59:04 -08:00
Chris Wilson ed77f93b6f Adjust color of links on the multi-tracker. 2021-03-06 00:37:14 -05:00
Fabian Dill 63fda9535a use jinja's url_for instead of manual text assembling 2021-03-06 06:09:12 +01:00
Fabian Dill 11e1125044 fixes for solo tracker 2021-03-06 05:59:49 +01:00
Fabian Dill 567954a17f Merge branch 'main' into breaking_changes
# Conflicts:
#	BaseClasses.py
2021-03-06 05:27:16 +01:00
CaitSith2 94b25112cd Whoops, min, not max. 2021-03-05 13:56:55 -08:00
CaitSith2 28fd8274b2 Set max progressive items. 2021-03-05 13:47:27 -08:00
CaitSith2 8c80909551 Correctly attribute items to each player. 2021-03-05 13:38:16 -08:00
Chris Wilson 280f3938ed Add Triforce HUD options to weighted settings page
- Added triforce hud options
- Fix a bug causing weighted settings to always fail to load (git blame forthcoming)
- Update ws_version to prompt users to update
- Who is Murahalda? (corrected to Murahadala)
2021-03-03 17:47:35 -05:00
Fabian Dill 0d576eefbb Merge branch 'main' into breaking_changes
# Conflicts:
#	Main.py
#	worlds/alttp/EntranceRandomizer.py
2021-03-03 01:54:52 +01:00
Fabian Dill 7871555620 Implement PrintJSON
Remove deprecated network packets
Make Client send new locations checked only once
Simplify register_location_checks
Rip out Server savegame compatibility
2021-03-02 22:31:44 +01:00
CaitSith2 2e275d1f4e Merge remote-tracking branch 'pepperpow/triforce_changes' into main 2021-02-26 19:56:44 -08:00
Chris Wilson 8615b2f0f5 Finish implementing the player tracker 2021-02-25 01:16:22 -05:00
Chris Wilson c38eafeb59 Eliminate excess data being passed to playerTracker.html 2021-02-23 23:16:02 -05:00
Chris Wilson cb4ed06eb8 Fix progressive items not being tracked correctly 2021-02-23 22:43:40 -05:00
Chris Wilson 1749ca333c Fix alignment issue, include checks done / total checks 2021-02-23 20:19:41 -05:00
Chris Wilson 34c74c9d2a Set up basic template for player tracker 2021-02-23 19:34:35 -05:00
Chris Wilson 9c8169afa2 Correct wording on the weighted settings page regarding the restrict_dungeon_item_on_boss setting. 2021-02-23 01:06:49 -05:00
Chris Wilson c0c3d523ca Merge branch 'solo-tracker' into main 2021-02-23 00:06:35 -05:00
Chris Wilson 3027112a45 Finish writing backend for Jinja template for player-tracker 2021-02-23 00:05:31 -05:00
pepperpow 222784dbb6 Merge branch 'main' of https://github.com/Berserker66/MultiWorld-Utilities into triforce_changes 2021-02-22 22:44:43 -06:00
Fabian Dill ff9b24e88e Hollow Knight integration
(prototype status)
2021-02-21 20:17:24 +01:00
Fabian Dill dcce53f8c8 Merge branch 'main' into breaking_changes
# Conflicts:
#	Adjuster.py
#	Gui.py
#	MultiClient.py
#	setup.py
#	worlds/alttp/AdjusterMain.py
#	worlds/alttp/Main.py
2021-02-21 20:15:07 +01:00
Fabian Dill c0cd79f0d7 Garbage Collect Autohost subprocesses to accumulate less open file descriptors which may crash the webhost service. 2021-02-21 11:07:02 +01:00
Chris Wilson 67f0663715 Initial testing commit for a solo-tracker on the website. Nothing to see here. 2021-02-21 00:38:53 -05:00
Chris Wilson 5e8b4ac3ce Weighted Settings v4.0.1 rev1 - Fix a bug (it was a typo) causing the "puke" palettes to never be updated on weighted settings files generated from the website.
- Also added the "reduceflashing" option to weighted settings
2021-02-19 17:50:49 -05:00
pepperpow fca64f1177
Removes Flashing instances in game (#168)
* Added reduced flashing, triforce hud and cutscene options

* Corrected parameters and replacement order

* Mixed up rom byte

* Removed triforce hud, smoothed cutscene speed and reset tables

* Removed triforcehud line and added bird cutscene speedup

* Added options to yaml

* Added check for race rom generation (is not internal asm)

* Added options to GUI (check sprite adjust crash)

* Fixed inconsistency in setting weight

* A "slow" setting for the cutscenespeed (#1)

* Slow wall setting

* Slow wall setting

* Slow wall setting

* Slow wall setting

* Slow wall setting

* Slow wall setting

* Update playerSettings.yaml

* Remove instances of cutscene speed modification

* Changed command to remove to mitigate frame advantage

* Antiepilepsy enabled for default/race roms, param change, RTL byte

* Found a frame independent antiflashing patch for real

* Further ASM patching style

* Reduce these changes to just two bytes

* Added patches for Dark Mountain and Ether Flashing palette reveal

Co-authored-by: StructuralMike <66819228+StructuralMike@users.noreply.github.com>
2021-02-19 17:45:54 +01:00
Fabian Dill 68c639d798 empty text comes before text; right. 2021-02-19 15:23:18 +01:00
Fabian Dill 9b6a695551 default sort hints table so that it pushes found hints to the bottom 2021-02-19 15:18:26 +01:00
Fabian Dill 122e360ec8 Merge branch 'main' into breaking_changes
# Conflicts:
#	MultiClient.py
#	Utils.py
#	worlds/alttp/ItemPool.py
#	worlds/alttp/Main.py
#	worlds/alttp/Shops.py
2021-02-19 13:45:50 +01:00
Chris Wilson 1eaab4e843 Implement a versioning system for the weighted-settings page 2021-02-07 13:58:24 -05:00
pepperpow 1d1abb7d22 Removed remnants of team stuff, make hide_goal default 2021-02-05 20:37:27 -06:00
Chris Wilson 87be751e45 Adjust the weighted settings json config file to properly reflect the key values for the shop_shuffle_slots option 2021-02-05 19:01:38 -05:00
Chris Wilson 5d84df4fa0 Fix a bug in the weighted settings causing the sprite list to not update when a preset is changed 2021-02-05 18:55:53 -05:00
Chris Wilson 239b365264 Remove outdated warning about QUsb2Snes version 2021-02-03 23:15:09 -05:00
Fabian Dill 078ad30195 Fix Multiworld tracker 2021-02-01 01:58:08 +01:00
Chris Wilson b4502f1338 Fix indentation bug in weightedSettings.yaml 2021-01-30 19:05:06 -05:00
Chris Wilson 889d24606f Updated weighted settings to reflect new beemizer documentation and include pyramid_open options 2021-01-30 19:03:54 -05:00
Fabian Dill a646594f08 Merge branch 'main' into breaking_changes
# Conflicts:
#	BaseClasses.py
#	Fill.py
#	MultiClient.py
#	MultiServer.py
#	Utils.py
#	test/dungeons/TestDungeon.py
#	test/inverted/TestInverted.py
#	test/inverted_minor_glitches/TestInvertedMinor.py
#	test/inverted_owg/TestInvertedOWG.py
#	test/minor_glitches/TestMinor.py
#	test/owg/TestVanillaOWG.py
#	test/vanilla/TestVanilla.py
#	worlds/alttp/ItemPool.py
#	worlds/alttp/Main.py
#	worlds/alttp/Rom.py
2021-01-30 23:29:32 +01:00
pepperpow 82fc2aba20 Added triforce hud options, expanded triforce requirement 2021-01-29 15:42:00 -06:00
Chris Wilson 5f4a1636aa Fix certain settings not being set properly on the weighted settings page. 2021-01-26 18:29:23 -05:00
Chris Wilson 761f798f39 Fix formatting in Plando tutorial 2021-01-24 21:31:33 -05:00
Chris Wilson 635d04f6ec Update Player Settings and Weighted Settings pages on website to reflect new possible settings.
- Also fix a bug caused by the website settings always forcing options to lowercase
2021-01-24 21:14:58 -05:00
CaitSith2 5c427f5e3e Add Ice rod hunt to player settings and weighted settings. 2021-01-24 14:52:42 -08:00
Fabian Dill 9386a9c220 Update Menus 2021-01-24 21:58:26 +01:00
Fabian Dill a6dad66b59 Merge branch 'multishop' 2021-01-24 20:30:52 +01:00
Fabian Dill 441fa3e5db Allow Plando'ing Dungeon Prizes
There be dragons beyond this point.
2021-01-24 08:26:39 +01:00
Fabian Dill 670b8b4b11 Merge branch 'main' into breaking_changes
# Conflicts:
#	MultiClient.py
#	WebUI.py
2021-01-21 05:36:16 +01:00
Fabian Dill 2b730ab1d4 Merge branch 'main' into multishop 2021-01-18 22:30:05 +01:00
Fabian Dill 4fb8067b5e document item plando force parameter 2021-01-18 05:07:53 +01:00
Fabian Dill f4281f81f5 Merge branch 'main' into multishop 2021-01-17 22:08:43 +01:00
Fabian Dill 0286a81755 plando world false is default 2021-01-17 21:42:28 +01:00
Fabian Dill 26314f7c13 Document Connection Plando
and show where Connection Plando Errors come from
2021-01-17 18:28:10 +01:00
Fabian Dill 446893c504 Document Item Plando 2021-01-17 17:58:58 +01:00
Fabian Dill 514cd19367 Merge branch 'main' into breaking_changes
# Conflicts:
#	BaseClasses.py
#	Mystery.py
#	WebHostLib/downloads.py
#	WebHostLib/models.py
#	WebHostLib/templates/macros.html
#	WebHostLib/upload.py
#	worlds/alttp/ItemPool.py
#	worlds/alttp/Main.py
2021-01-17 06:50:25 +01:00
Fabian Dill 3b5ba161de first two plando modules documented 2021-01-17 02:15:46 +01:00
Fischfilet89 65fa39df95
Update weightedSettings.json (#162)
fixed a typo at line 1020 regarding enemy health on the setting "armor-plated"
2021-01-16 00:38:55 +01:00
Fabian Dill 25330bd730 Fix displaying Race Seeds 2021-01-16 00:32:52 +01:00
CaitSith2 10a4a89c5f Merge branch 'main' into multishop 2021-01-15 01:41:36 -08:00
Edos512 fd888d9e31
Update MSU spanish tutorial (#161)
Added Stream-safe MSU packs section
2021-01-13 22:35:49 +01:00
Fabian Dill 67731d9e53 Merge branch 'main' into multishop 2021-01-13 15:00:19 +01:00
Chris Wilson 9aea7fa113 Update wording on host game page 2021-01-12 21:09:59 -05:00
Chris Wilson 51003275d4 Minor size adjustment to "Stream Safe MSU Packs" header 2021-01-11 23:05:06 -05:00
Chris Wilson 4880d12654 Re-worded the MSU tutorial to be more technically correct. 2021-01-11 23:03:54 -05:00
Chris Wilson 092fde54fd Add a list of stream-safe MSU packs to the MSU-1 tutorial 2021-01-11 19:59:27 -05:00
Fabian Dill e36c6e97c1 Merge remote-tracking branch 'pepper/multishop-all' into multishop
# Conflicts:
#	EntranceRandomizer.py
#	Rom.py
#	WebHostLib/static/static/playerSettings.json
#	data/basepatch.bmbp
2021-01-09 16:03:59 +01:00
Chris Wilson 0160487ca9 Add French MSU-1 tutorial translation by Coxla 2021-01-05 17:20:57 -05:00
Fabian Dill 9d7cdc99f1 link spanish tutorial 2021-01-05 22:58:30 +01:00
Edos512 bd211fd0b5
Create msu1_es.md (#157)
Subbida de traduccion
2021-01-05 21:22:18 +01:00
Chris Wilson 975a40e093 Change header title to "Archipelago" 2021-01-03 17:48:27 -05:00
Chris Wilson b063407d2b Update WebHost to include new tutorial landing page.
- Added MSU-1 setup guide
- Updated header and landing page for title change
- Re-structured tutorial files
- Added tutorials.json, which is used when constructing the new /tutorial page
2021-01-03 17:46:47 -05:00
Fabian Dill eb58ee2422 fix downloading and displaying patches for seeds/rooms with teams 2021-01-03 18:28:07 +01:00
Fabian Dill 07954fc230 update connect link 2021-01-03 17:49:30 +01:00
Fabian Dill 8ebd36b5a7 update Archipelago 2021-01-03 14:32:32 +01:00
Fabian Dill 08ca4245c1 Merge branch 'main' into breaking_changes
# Conflicts:
#	Adjuster.py
#	AdjusterMain.py
#	BaseClasses.py
#	MultiClient.py
#	MultiServer.py
#	Mystery.py
#	Utils.py
#	WebHostLib/downloads.py
#	WebHostLib/generate.py
#	dumpSprites.py
#	test/TestBase.py
#	worlds/alttp/EntranceRandomizer.py
#	worlds/alttp/Main.py
#	worlds/alttp/Rom.py
2021-01-03 13:13:59 +01:00
Fabian Dill f3b6be2b20 Item Plando Support 2021-01-02 12:49:43 +01:00
Fabian Dill 7f9b4ef9d0 use sortable table on Roll Results page
(cherry picked from commit 32d8f33932d913154989e41c940ba24adc98a881)
2020-12-19 19:38:12 +01:00
Fabian Dill 84d74fab77 use sortable table on Roll Results page
(cherry picked from commit 32d8f33932d913154989e41c940ba24adc98a881)
2020-12-19 19:36:23 +01:00
CaitSith2 51fa516ab9 Add nice seed generation error page. 2020-12-08 21:30:26 -08:00
Chris Wilson 2e1f3c2338 Include updated French tutorial by Coxla 2020-12-06 12:42:16 -05:00
Chris Wilson abaaa88304 Change "Tile Hints" to "Hints" 2020-12-06 12:19:25 -05:00
Chris Wilson 0e8d72b274 Add capacity upgrades to shop shuffle on /player-settings 2020-12-06 12:03:14 -05:00
Fabian Dill 7872285e95 re-re-export spriteData 2020-12-06 17:21:44 +01:00
Fabian Dill 70f398ec73 re-export spriteData 2020-12-06 17:12:41 +01:00
Chris Wilson c6148ce6ad Include BotW Zelda.gif 2020-12-06 11:03:50 -05:00
Chris Wilson 5a1f936694 Fix missing sprites on /weighted-settigs page, add author information to tooltip 2020-12-06 10:55:58 -05:00
Fabian Dill 493d5aa156 technically random 2020-12-06 14:48:21 +01:00
Fabian Dill 45d55414e1 unify simple settings ER options naming scheme 2020-12-06 14:45:53 +01:00
Fabian Dill a5d00e17c9 fix attribute access in user api 2020-12-06 14:05:47 +01:00
Fabian Dill e98a8cae9a add user-specific api endpoints
requires session cookie
2020-12-06 14:04:52 +01:00
Chris Wilson 6450e72deb Add options to /player-settings, fix incorrect names, note that the /weighted-settings page is advanced 2020-12-06 00:16:22 -05:00
Chris Wilson dc04034934 Fix sprite data saving incorrectly on /player-settings 2020-12-05 21:34:15 -05:00
Fabian Dill 8b89c4d5c4 Expand Webhost with per-sprite data with author and filename source 2020-12-05 23:25:26 +01:00
Chris Wilson 644ce713bd Fix a style regression on /tutorial 2020-12-05 16:05:53 -05:00
Chris Wilson 1a62772825 Slew of minor style adjustments
- Added padding to bottom of /setup-guide to accomodate iPhone users with curved screen bottoms
- Added screen orientation detection to /player-settings to force select inputs into a single column on mobile devices
- Added an X to the cookie notice to indicate it can be closed
- Changed "Generate Game" to "Start Game" so it matches the header
2020-12-05 15:37:31 -05:00
Chris Wilson 63d4162c97 Fix missing paging on /user-content 2020-12-05 14:59:29 -05:00
Chris Wilson 787242bb5f Adjust landing style for mobile view to place content island first 2020-12-04 23:07:05 -05:00
Chris Wilson 64b5b28d47 Fix an animation bug on mobile devices on the landing page 2020-12-04 23:00:06 -05:00
Chris Wilson 94c35457fe
Merge pull request #152 from Edos512/master
Update spanish tutorial
2020-12-04 20:33:56 -05:00
Fabian Dill c2be5a84f9 Make debug secret key consistent 2020-12-05 00:43:18 +01:00
Chris Wilson e67852ba2c Add a link to the user-content page to player-settings 2020-12-04 18:28:17 -05:00
Chris Wilson 89419aba98 Merge branch 'master' of https://github.com/berserker66/MultiWorld-Utilities 2020-12-04 18:25:16 -05:00
Chris Wilson 18afeed437 Add user-content page 2020-12-04 18:22:21 -05:00
Fabian Dill 62c330788b Update WebHost sprites 2020-12-04 23:56:21 +01:00
Edos512 483fc6950a Update tutorial_es.md 2020-12-04 23:52:58 +01:00
Edos512 76cdabd2cb Revert "Revert "Merge branch 'pr/151'""
This reverts commit ce23369b0b.
2020-12-04 23:52:03 +01:00
Edos512 ce23369b0b Revert "Merge branch 'pr/151'"
This reverts commit ffdaed9ea97bdc49d7d81f74f0c2e6462c6a9bdf, reversing
changes made to 1ea9197976b6f2ad2626fb453dc52acc787f9ddc.
2020-12-04 23:51:21 +01:00
Fabian Dill 9e0ed8ab5b Add Seeds Table 2020-12-04 23:25:49 +01:00
Chris Wilson db5b8ad52c Fix a page alignment bug caused by DataTables 2020-12-04 16:48:01 -05:00
Chris Wilson fc61e809cf Better wording for the main page 2020-12-04 16:13:07 -05:00
Chris Wilson 850c50494a Put wiki link back into the footer. 2020-12-04 16:05:14 -05:00
Chris Wilson e89dc31956 Add player names to a tooltip on player count for /uploads page 2020-12-04 16:02:41 -05:00
Chris Wilson 3979013aa9 Add player names to a tooltip on player count for /uploads page 2020-12-04 15:49:05 -05:00
Chris Wilson f2afd1eef9 Restore columns to /uploads, fix styling for table, re-enable sorting 2020-12-04 15:28:46 -05:00
Chris Wilson 929239004d Adjust table styling and content on Host Game page 2020-12-04 15:21:08 -05:00
Chris Wilson fbce8f26f5 Update setup guide and change MultiWorld to Archipelago on the footer 2020-12-04 15:05:48 -05:00
Chris Wilson eebaee3030 Add sprite picker to start game page. Improve styles on verification page. Update global styles. 2020-12-04 05:30:03 -05:00
Chris Wilson 5529f4232b UX Improvements. Add Generate buttons to weighted settings page. 2020-12-04 03:40:46 -05:00
Chris Wilson 73013395a7 Fix bug in api wait_seed, fix styles on seed gen pages 2020-12-04 02:59:23 -05:00
Chris Wilson 79095b7dde Remove some debug code 2020-12-04 00:42:33 -05:00
Chris Wilson 71209a962a Add simpler Player Settings page 2020-12-04 00:40:57 -05:00
Chris Wilson da6c44a1cf Working on player-settings update 2020-12-03 18:27:32 -05:00
Chris Wilson ccdc8cefe4 Many small adjustments
- Adjust header width for scrollbar presence
- Added new header assets for grass and dirt
- Adjusted styles for hosted and tracker
- Expand header to implement templating system
- Much more I have forgotten
2020-12-03 01:55:48 -05:00
Chris Wilson ef14aff201 Apply new styles to hosted room. 2020-12-03 00:18:09 -05:00
Chris Wilson af547fea12 Change footer text to MultiWorld 2020-12-03 00:06:15 -05:00
Chris Wilson 7b9c18eee2 Finalize styles. Release candidate. 2020-12-02 23:48:10 -05:00
Chris Wilson ce5f8d7267 Implement button styles 2020-12-02 23:05:37 -05:00
pepperpow 37493c85dc Merge branch 'shop-generate' of github.com:pepperpow/MultiWorld-Utilities into multishop-all 2020-12-02 20:41:49 -06:00
pepperpow 7b5bd016b9 Merge branch 'potion-shop' of github.com:pepperpow/MultiWorld-Utilities into multishop-all 2020-12-02 20:35:59 -06:00