Commit Graph

622 Commits

Author SHA1 Message Date
Edos512 8fc9a9c55e
Update WebHostLib/static/assets/tutorial/zeldaOOT/zeldaOOT_en.md
Co-authored-by: Hussein Farran <hmfarran@gmail.com>
2021-10-04 22:44:09 +02:00
Edos512 8e457d9b8f
Merge branch 'ArchipelagoMW:main' into main 2021-10-04 21:52:14 +02:00
Edos512 aa37c9bf81 Update OOT tutorials
Some typos, added how to solve disconnects.
2021-10-04 21:51:50 +02:00
Edos512 89cbd05600 OOT tutorials added 2021-10-04 21:45:54 +02:00
alwaysintreble ea753cd8bf Added a general archipelago setup tutorial for installing, generating, and hosting multiworlds. 2021-10-03 17:47:55 -05:00
Fabian Dill 391f42b4f2 Timespinner: some game info fixes 2021-09-30 19:51:44 +02:00
Jarno Westhof cff5db446d
Fixed some bugs + added documentation + added a few features (#87)
* Refactorings + minor logic fix

* Fixed unnececerly recalculation of item_name_groups

* Enabled other itemId's so that they can be send to client when desired

* Marked the loss of location 1337158

* Updated network graph

* First draft tinmespinner documentation

* Moved personal items to slot_data rather than location scouts

* Disabled Remote Items

* Updated docs

* Fixed port override
2021-09-30 19:51:07 +02:00
alwaysintreble 89c6fd6ac4 Put links back to being separate but still use them as hyperlinks 2021-09-28 13:00:02 +00:00
alwaysintreble 1ffe5fc7bb Remove scraps only preset since it doesn't work. Increase item pool to 100. Add direct links in tutorial. 2021-09-28 13:00:02 +00:00
Fabian Dill 8b9e278593 Guides: Link to new LttP player-settings page 2021-09-26 07:24:47 +02:00
Fabian Dill 655ebcdb07 WebHost: allow .json, .yml on /generate 2021-09-26 06:50:46 +02:00
espeon65536 c3070be14a Update small and boss key counters during the normal update cycle 2021-09-24 23:10:26 +00:00
espeon65536 5570440eb1 Ocarina of Time webtracker 2021-09-24 18:44:25 +00:00
Edos512 8411b76ee5
Update minecraft_es.md (#80)
* Update minecraft_es.md

Updated spanish minecraft tutorial
2021-09-24 20:42:35 +02:00
Edos512 c0ff90fc86 Update minecraft_es.md
Little warning added
2021-09-24 18:29:43 +02:00
Edos512 f9c8816c43 Update minecraft_es.md
Updated spanish minecraft tutorial
2021-09-24 18:23:22 +02:00
Fabian Dill 7ac9bd8591 tracker.py: run Reformat Code 2021-09-23 13:52:32 +02:00
Fluffyhairedguy 68a5784650
New column for generic tracker (#78)
* Adding order received column to generic tracker. Progressive items will have the most recent number only.
2021-09-23 13:48:25 +02:00
Fabian Dill 3caf8bc82b WebHost: Allow plando
Maybe move to a different webpage?
2021-09-23 02:29:24 +02:00
Chris Wilson df0e8bc027 Remove aliased options from player-settings pages 2021-09-22 00:21:57 -04:00
Chris Wilson 77878bf714 Fill out game info pages for LttP, OoT, Factorio, and Subnautica. Revert MD pages to stop using simple line breaks. 2021-09-18 16:15:40 -04:00
Chris Wilson 25b9fc8b6a Better wording for player-settings reset banner 2021-09-17 21:24:52 -04:00
Chris Wilson 090678776e Add version hashing to player-settings pages 2021-09-17 21:23:31 -04:00
Chris Wilson 9be6d443d7 Fix /gameInfo pages not loading markdown correctly 2021-09-17 20:39:53 -04:00
Chris Wilson 678253d037 Fix /games page not working 2021-09-17 20:35:31 -04:00
Fabian Dill bd561fd191 WebHost: fix Py39(only?) jinja weirdness with undefined attribute checking 2021-09-18 01:32:34 +02:00
Fabian Dill 38b5ee7314 WebHost: working web-gen 2021-09-18 01:02:26 +02:00
Chris Wilson 11245462f0 Added gameInfo page using markdown, removed old game sub-pages and directories 2021-09-17 18:41:26 -04:00
Fabian Dill a82bf1bb32 Options: raise Exception if per-game options are in root
Options: implement progression balancing and accessibility on new system
Options: implement the notion of "common" and "per_game_common" options in various systems
Options: centralize item and location name checking
Spoiler: prettier print some lists, sets and dicts
WebHost: add common options into /templates
2021-09-17 00:17:54 +02:00
Chris Wilson abc0220cfa Include the game name in the generated JSON files used to populate player-settings pages 2021-09-16 17:15:25 -04:00
Fabian Dill 033adceb6f LttP: move some simple Toggle options over to new system 2021-09-13 01:32:32 +02:00
Fabian Dill 494cfb3c04 Setup Guides: update LttP en and de guides with SNI 2021-09-10 15:20:45 +02:00
Hussein Farran 683514d891
Merge branch 'main' into main 2021-09-08 15:03:19 -04:00
Chris Wilson 61b875256f Add table styling to markdown css 2021-09-07 19:41:04 -04:00
Chris Wilson 6352056528 Enable QOL features in showdown extension 2021-09-07 19:22:04 -04:00
alwaysintreble bd4f24844b Update documentation for new options. 2021-09-07 17:50:43 -05:00
Fainspirit 3e4e69735e Fixed awkward phrasing in FAQ 2021-09-05 12:38:07 +00:00
Chris Wilson 4afc351933 Fill out FAQ on the website 2021-09-04 19:23:09 -04:00
Fabian Dill 1b27fc495f Ocarina of Time: reduce memory use by 64 MiB for each OoT world past the first
Ocarina of Time: limit parallel output to 2, to not waste memory that doesn't benefit speed
Ocarina of Time: remove swarm of os.chdir()
2021-09-03 12:50:26 +02:00
espeon65536 51c38fc628
Ocarina of Time (#64)
* first commit (not including OoT data files yet)

* added some basic options

* rule parser works now at least

* make sure to commit everything this time

* temporary change to BaseClasses for oot

* overworld location graph builds mostly correctly

* adding oot data files

* commenting out world options until later since they only existed to make the RuleParser work

* conversion functions between AP ids and OOT ids

* world graph outputs

* set scrub prices

* itempool generates, entrances connected, way too many options added

* fixed set_rules and set_shop_rules

* temp baseclasses changes

* Reaches the fill step now, old event-based system retained in case the new way breaks

* Song placements and misc fixes everywhere

* temporary changes to make oot work

* changed root exits for AP fill framework

* prevent infinite recursion due to OoT sharing usage of the address field

* age reachability works hopefully, songs are broken again

* working spoiler log generation on beatable-only

* Logic tricks implemented

* need this for logic tricks

* fixed map/compass being placed on Serenade location

* kill unreachable events before filling the world

* add a bunch of utility functions to prepare for rom patching

* move OptionList into generic options

* fixed some silly bugs with OptionList

* properly seed all random behavior (so far)

* ROM generation working

* fix hints trying to get alttp dungeon hint texts

* continue fixing hints

* add oot to network data package

* change item and location IDs to 66000 and 67000 range respectively

* push removed items to precollected items

* fixed various issues with cross-contamination with multiple world generation

* reenable glitched logic (hopefully)

* glitched world files age-check fix

* cleaned up some get_locations calls

* added token shuffle and scrub shuffle, modified some options slightly to make the parsing work

* reenable MQ dungeons

* fix forest mq exception

* made targeting style an option for now, will be cosmetic later

* reminder to move targeting to cosmetics

* some oot option maintenance

* enabled starting time of day

* fixed issue breaking shop slots in multiworld generation

* added "off" option for text shuffle and hints

* shopsanity functionality restored

* change patch file extension

* remove unnecessary utility functions + imports

* update MIT license

* change option to "patch_uncompressed_rom" instead of "compress_rom"

* compliance with new AutoWorld systems

* Kill only internal events, remove non-internal big poe event in code

* re-add the big poe event and handle it correctly

* remove extra method in Range option

* fix typo

* Starting items, starting with consumables option

* do not remove nonexistent item

* move set_shop_rules to after shop items are placed

* some cleanup

* add retries for song placement

* flagged Skull Mask and Mask of Truth as advancement items

* update OoT to use LogicMixin

* Fixed trying to assign starting items from the wrong players

* fixed song retry step

* improved option handling, comments, and starting item replacements

* DefaultOnToggle writes Yes or No to spoiler

* enable compression of output if Compress executable is present

* clean up compression

* check whether (de)compressor exists before running the process

* allow specification of rom path in host.yaml

* check if decompressed file already exists before decompressing again

* fix triforce hunt generation

* rename all the oot state functions with prefix

* OoT: mark triforce pieces as completion goal for triforce hunt

* added overworld and any-dungeon shuffle for dungeon items

* Hide most unshuffled locations and events from the list of locations in spoiler

* build oot option ranges with a generic function instead of defining each separately

* move oot output-type control to host.yaml instead of individual yamls

* implement dungeon song shuffle

* minor improvements to overworld dungeon item shuffle

* remove random ice trap names in shops, mostly to avoid maintaining a massive censor list

* always output patch file to folder, remove option to generate ROM in preparation for removal

* re-add the fix for infinite recursion due to not being light or dark world

* change AP-sendable to Ocarina of Time model, since the triforce piece has some extra code apparently

* oot: remove item_names and location_names

* oot: minor fixes

* oot: comment out ROM patching

* oot: only add CollectionState objects on creation if actually needed

* main entrance shuffle method and entrances-based rules

* fix entrances based rules

* disable master quest and big poe count options for client compatibility

* use get_player_name instead of get_player_names

* fix OptionList

* fix oot options for new option system

* new coop section in oot rom: expand player names to 16 bytes, write AP_PLAYER_NAME at end of PLAYER_NAMES

* fill AP player name in oot rom with 0 instead of 0xDF

* encode player name with ASCII for fixed-width

* revert oot player name array to 8 bytes per name

* remove Pierre location if fast scarecrow is on

* check player name length

* "free_scarecrow" not "fast_scarecrow"

* OoT locations now properly store the AP ID instead of the oot internal ID

* oot __version__ updates in lockstep with AP version

* pull in unmodified oot cosmetic files

* also grab JSONDump since it's needed apparently

* gather extra needed methods, modify imports

* delete cosmetics log, replace all instances of SettingsList with OOTWorld

* cosmetic options working, except for sound effects (due to ear-safe issues)

* SFX, Music, and Fanfare randomization reenabled

* move OoT data files into the worlds folder

* move Compress and Decompress into oot data folder

* Replace get_all_state with custom method to avoid the cache

* OoT ROM: increment item counter before setting incoming item/player values to 0, preventing desync issues

* set data_version to 0

* make Kokiri Sword shuffle off by default

* reenable "Random Choice" for various cosmetic options

* kill Ruto's Letter turnin if open fountain
also fix for shopsanity

* place Buy Goron/Zora Tunic first in shop shuffle

* make ice traps appear as other items instead of breaking generation

* managed to break ice traps on non-major-only

* only handle ice traps if they are on

* fix shopsanity for non-oot games, and write player name instead of player number

* light arrows hint uses player name instead of player number

* Reenable "skip child zelda" option

* fix entrances_based_rules

* fix ganondorf hint if starting with light arrows

* fix dungeonitem shuffle and shopsanity interaction

* remove has_all_of, has_any_of, count_of in BaseClasses, replace usage with has_all, has_any, has_group

* force local giveable item on ZL if skip_child_zelda and shuffle_song_items is any

* keep bosses and bombchu bowling chus out of data package

* revert workaround for infinite recursion and fix it properly

* fix shared shop id caches during patching process

* fix shop text box overflows, as much as possible

* add default oot host.yaml option

* add .apz5, .n64, .z64 to gitignore

* Properly document and name all (functioning) OOT options

* clean up some imports

* remove unnecessary files from oot's data

* fix typo in gitignore

* readd the Compress and Decompress utilities, since they are needed for generation

* cleanup of imports and some minor optimizations

* increase shop offset for item IDs to 0xCB

* remove shop item AP ids entirely

* prevent triforce pieces for other players from being received by yourself

* add "excluded" property to Location

* Hint system adapted and reenabled; hints still unseeded

* make hints deterministic with lists instead of sets

* do not allow hints to point to Light Arrows on non-vanilla bridge

* foreign locations hint as their full name in OoT rather than their region

* checkedLocations now stores hint names by player ID, so that the same location in different worlds can have hints associated

* consolidate versioning in Utils

* ice traps appear as major items rather than any progression item

* set prescription and claim check as defaults for adult trade item settings

* add oot options to playerSettings

* allow case-insensitive logic tricks in yaml

* fix oot shopsanity option formatting

* Write OoT override info even if local item, enabling local checks to show up immediately in the client

* implement CollectionState.can_live_dmg for oot glitched logic

* filter item names for invalid characters when patching shops

* make ice traps appear according to the settings of the world they are shuffled into, rather than the original world

* set hidden-spoiler items and locations with Shop items to events

* make GF carpenters, Gerudo Card, Malon, ZL, and Impa events if the relevant settings are enabled, preventing them from appearing in the client on game start

* Fix oot Glitched and No Logic generation

* fix indenting

* Greatly reduce displayed cosmetic options

* Change oot data version to 1

* add apz5 distribution to webhost

* print player name if an ALttP dungeon contains a good item for OoT world

* delete unneeded commented code

* remove OcarinaSongs import to satisfy lint
2021-09-02 14:35:05 +02:00
Chris Wilson 859316353e Link /games to player-settings pages, add link to template file to player-settings, add markdown style formatting to /templates 2021-09-01 20:47:36 -04:00
Hussein Farran 63c9bea724 Remove `total_items` option. 2021-09-01 21:47:29 +00:00
Fabian Dill ac915d00fc
Merge branch 'main' into main 2021-09-01 11:23:30 +00:00
Hussein Farran 5188b41ab0 Update RoR2 guide. 2021-08-31 20:42:16 -04:00
Chris Wilson 4fcce66505 Move game names and descriptions into AutoWorld, fix option value names on player-settings pages 2021-08-31 17:28:46 -04:00
Fabian Dill adfd68f83c Options: fix get_option_name 2021-08-31 22:14:18 +02:00
Fabian Dill ddc619f2e7 WebHost: sample yamls: some formatting issues 2021-08-31 19:56:45 +02:00
Fabian Dill ff2e57705e WebHost: sample yamls now render Range defaults correctly 2021-08-31 19:54:55 +02:00
Fabian Dill a6a859b272 WebHost: fix sample yamls that have no options.
WebHost: hide hidden games from templates listing
2021-08-31 19:06:24 +02:00
Fabian Dill 88c5ebdd2f WebHost: add per-game yaml file downloads 2021-08-31 18:58:54 +02:00
Hussein Farran 2f4b248a45 Add more information to the RoR2 docs. 2021-08-31 00:25:48 -04:00
Hussein Farran 2f28afb46e Add RoR2 Docs 2021-08-31 00:17:08 -04:00
Fabian Dill 5daadcb2d5 LttP: implement new dungeon_items handling
LttP: move glitch_boots to new options system
WebHost: options.yaml no longer lists aliases
General: remove region.can_fill, it was only used as a hack to make dungeon-specific items to work
2021-08-30 16:31:56 +02:00
Fabian Dill 8c72b0a6c4 AutoYAML: proper multi-line comments 2021-08-29 18:13:38 +02:00
Chris Wilson 4c0f0a16c9 Updates to WebHost
- Support displayname option for Options module
- Improvements to landing page
- Added multi-language capable FAQ page
- Removed weighted-settings page
- Removed references to weighted-settings page
2021-08-22 20:01:58 -04:00
Fabian Dill 6a3d1fcaf4 LttP & Factorio: fix item state removal for progressive items. 2021-08-21 06:55:08 +02:00
Fabian Dill 4aeb3cd3dc WebHost: allow /tutorial and /tutorial/ 2021-08-20 22:41:23 +02:00
espeon65536 fbaa8226c4 Minecraft tracker: only lookup recognized item ids 2021-08-14 19:58:23 +00:00
Kono Tyran 285b9e12eb - Add Minecraft to inno_setup_38.iss, this will download java and forge and install them. 2021-08-10 18:42:25 +00:00
Fabian Dill ba3bb201cd Multiple: Followed a rabbit hole of moving LttP Rom generation to AutoWorld
Generator: Re-allow names with spaces (and see what breaks)
Generator: Removed teams (Note that teams are intended to move from a generation step feature to a server runtime feature, allowing dynamic creation of an already generated MW)
LttP: All Rom Options are now on the new system
LttP: palette option "random" is now called "good"
LttP: Roms are now created as part of the general output file creation step
LttP: disable Music is now Music, removing potential double negatives
LttP & Factorio: Progressive option random is now grouped_random
LttP: Enemy damage option random is now Enemy damage: chaos
2021-08-09 09:15:41 +02:00
espeon65536 b43e99fa20 better check for completion in MC webtracker 2021-08-07 00:44:57 +00:00
espeon65536 f62e8b7be9 Minecraft: write server and port to apmc on download 2021-08-07 00:44:57 +00:00
espeon65536 f655dc0dbc Minecraft tracker: formatting fix 2021-08-07 00:44:57 +00:00
espeon65536 95e0fa2672 Minecraft tracker: add progressive resource crafting 2021-08-07 00:44:57 +00:00
espeon65536 306bdd322f Minecraft tracker: fix incorrect bold css 2021-08-07 00:44:57 +00:00
espeon65536 231613cb3b Minecraft tracker: automated location tracking and dropdown tabs 2021-08-07 00:44:57 +00:00
espeon65536 2af5739592 Minecraft tracker v2
group advancements by category
update font to Minecraft font
always display pearl/scrap counter
2021-08-07 00:44:57 +00:00
espeon65536 b38f7c8f2a Minecraft web tracker, built as a mix of the LttP tracker and the generic tracker 2021-08-07 00:44:57 +00:00
alwaysintreble 7df06b87a5
reclarified some text (#38)
* reclarified some setup text
2021-07-31 16:02:38 +02:00
Chris Wilson a9ecab35d8 Add Subnautica to games list on WebHost 2021-07-26 17:21:00 -04:00
Chris Wilson e1e25d0eae Add range options to player-settings pages 2021-07-25 19:04:08 -04:00
Chris Wilson f45c042351 Include range options in generated JSON files for player-settings 2021-07-25 18:18:15 -04:00
Chris Wilson f15bb9dbd7 Fix player-settings not defaulting the select options to their proper values. Also fix tab title. 2021-07-25 18:07:03 -04:00
Chris Wilson 610871c61b Template gameName into player-settings as a data attribute to avoid potential security risks. 2021-07-25 15:49:51 -04:00
Fabian Dill 5c21538553 redirect old /hosted to new /room 2021-07-25 16:07:51 +02:00
Chris Wilson 153fa16bcf Redirect user to 404 page for non-existing player-settings pages 2021-07-24 23:20:46 -04:00
Chris Wilson 71642f494f Automatically generate and save player settings for every game 2021-07-24 23:09:34 -04:00
Chris Wilson 8ba408385b Update options.py to generate JSON files to be used with player-settings pages 2021-07-24 21:27:56 -04:00
Fabian Dill 78f565c706 renamed /hosted/ to /room/
remove no longer used options
allow loading of json data files from webhost when it gets run by gunicorn and similar
2021-07-24 14:08:45 +02:00
Fabian Dill 34ff5d9662 create options files on WebHost startup 2021-07-22 18:21:31 +02:00
Fabian Dill 75bf595f86 add (cached) /api/datapackage_version endpoint 2021-07-21 23:04:22 +02:00
Fabian Dill 312f13e254 add (cached) /api/datapackge endpoint 2021-07-21 22:55:44 +02:00
Fabian Dill 2fc4006dfa RIP: MultiMystery and Mystery, now there's just Generate
Other changes:
host.yaml Multi Mystery options were moved and changed
generate_output now has an output_directory argument
MultiWorld.get_game_players(<game>) now replaces <game>_player_ids
Python venv should now work properly
2021-07-21 18:08:15 +02:00
Fabian Dill a503134533 remove Gui.py, GuiUtils.py, ER_hint_reference.txt and icon.ico from root directory 2021-07-21 09:18:28 +02:00
Fabian Dill b53c5593a8 Automate dumpSprites.py - and then remove it 2021-07-20 18:23:06 +02:00
Fabian Dill 54177c7064 bump required LttP Client Version 2021-07-10 07:37:56 +02:00
Fabian Dill 4884184e4a fix autolauncher import 2021-07-09 22:47:35 +02:00
Fabian Dill ac919f72a8 Factorio: update setup 2021-07-03 00:30:00 +02:00
Fabian Dill 10aca70879 update Flask-Compress 2021-06-29 03:27:31 +02:00
Fabian Dill 4d4af9d74e WebHost: Guard each Room via file-lock 2021-06-29 03:11:48 +02:00
Chris Wilson aa28b3887f Apply Dewin's suggested filter to the Z3 Player Tracker 2021-06-26 22:32:29 -04:00
Chris Wilson cc85edafc4 Add "Host Game" button back to the website landing page 2021-06-25 16:59:59 -04:00
Fabian Dill 4b495557cd Tracker: sort numbers and fractions numerically 2021-06-25 21:15:54 +02:00
Fabian Dill d1fd1cd788 Tracker: sort Last Activity numerically, instead of text. 2021-06-25 21:05:44 +02:00
Chris Wilson bc9c93b180 Improvements to the WebHost
- Improved routing structure
- Improved style imports across site
- Added placeholder player-settings pages for Factorio and Minecraft
2021-06-15 21:18:14 -04:00
Chris Wilson 883ebbf267 Updating WebHost structure 2021-06-14 22:27:43 -04:00
Fabian Dill cd45116dce dynamify games listing 2021-06-15 02:35:40 +02:00
Chris Wilson d80362c4b8 Fix 404 pages 2021-06-14 20:20:23 -04:00
Chris Wilson 384e06d6fe Subdirectory pages currently 404. I'll look into this later 2021-06-14 20:18:40 -04:00
Fabian Dill e6f44a70d0 use flask convention for template fetching 2021-06-15 01:51:40 +02:00
Chris Wilson 0ca90ee7e8 Add subdirectory handling for zelda3, factorio, and minecraft. Add generic 404 page. 2021-06-14 19:35:02 -04:00
Chris Wilson 8c82d3e747 Added a page to describe the games currently supported by AP 2021-06-12 02:49:36 -04:00
Chris Wilson 7b495f3d81 Website landing page preliminary update 2021-06-11 20:22:47 -04:00
Fabian Dill d872ea32af Update various links 2021-06-06 22:14:13 +02:00
Fabian Dill 1d00ed463e fix updated name aliases for tracker 2021-06-05 03:54:16 +02:00
Fabian Dill 8b4ea3c80c fix max progressive item icon in per-player tracker 2021-06-03 01:02:31 +02:00
Fabian Dill 887a3b0922 update flask and jinja 2021-05-24 05:03:45 +02:00
Fabian Dill 8dad49e385 assign generic tracker's checked locations to correct player 2021-05-20 01:22:18 +02:00
Fabian Dill 518e5db55b use item_name filter for generic tracker 2021-05-19 21:57:10 +02:00
Fabian Dill 31a3c1cf33 Add a generic fallback tracker for all games 2021-05-19 21:55:18 +02:00
Fabian Dill 1f17aa394e allow uploading of Factorio mods 2021-05-16 22:59:45 +02:00
Fabian Dill a1d7bc558c preconfigure and sign qusb2snes 2021-05-16 18:30:13 +02:00
Fabian Dill de31fc320c allow webhost handling of APMC files 2021-05-16 01:16:51 +02:00
Kono Tyran 40751f267b removed reference to playersettings yaml as full descriptions are now in the provided example. 2021-05-15 22:46:21 +00:00
Fabian Dill 19896e1fae prepare webhost for multi-game per-slot downloads 2021-05-14 15:25:57 +02:00
Fabian Dill 23678b814d specify get_id as being alttp only 2021-05-14 14:38:23 +02:00
Fabian Dill 13fe1f2ea2 /api/generate send back error message 2021-05-14 14:12:21 +02:00
Chris Wilson c24d6a0785 Add error message to player-settings and weighted-settings pages if the call to /api/generate returns a non-2xx response code. 2021-05-13 21:33:56 -04:00
Fabian Dill b2f3fd56f4 bunch of fixes after testing round 2021-05-14 01:25:41 +02:00
Fabian Dill b82d6cec31 regain basic WebHost functionality 2021-05-13 21:57:11 +02:00
Fabian Dill fb192b989d update jinja templates to use base static files 2021-05-13 00:41:49 +02:00
Fabian Dill d35adc5868 Update Flask and Jinja
Flask Autoversion is now integrated
Flask config.from_file is now integrated
2021-05-13 00:28:53 +02:00
Kono Tyran 40ff0e867c fixed abbreviation ap to full name. 2021-05-11 21:38:34 +00:00
Fabian Dill 88d75a41ae Factorio setup tutorial 2021-05-10 22:42:11 +02:00
Fabian Dill 6fef30d9b3 remove german tutorial video 2021-05-10 13:06:51 +02:00
Fabian Dill f8c3b695d0 Add Swedish Minecraft Tutorial by Albinum 2021-05-10 01:46:42 +02:00
Edos512 431b64c574 Merge Tutorials from BM 2021-05-10 01:38:26 +02:00
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