mirror/Archipelago
1
0
Fork 1
mirror of https://github.com/ArchipelagoMW/Archipelago.git synced 2026-03-24 05:33:22 -07:00
Code Issues Packages Projects Releases Wiki Activity
6,492 Commits 122 Branches 55 Tags
796b17b3cbb2a078ad5eeaeda072aae5ea30ad65
Commit Graph

6492 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
spinerak
796b17b3cb Update offline mode so that it works again 2024-05-25 18:31:47 +02:00
spinerak
d8540239b2 Changed difficulties 2024-05-25 17:44:30 +02:00
spinerak
aed6696838 Update logic, added multiplicative categories 2024-05-25 16:03:03 +02:00
spinerak
343dce1267 Update .gitignore 2024-05-25 13:29:23 +02:00
spinerak
bc5b064dda Update .gitignore 2024-05-25 00:44:46 +02:00
spinerak
5820b1f7e7 Delete .gitignore 2024-05-25 00:41:39 +02:00
spinerak
49c698396d ignore gitignore 2024-05-25 00:41:12 +02:00
spinerak
d39f6650af Revert "Testing if I change the generate.py" 
This reverts commit 7c2b3df617.
 2024-05-25 00:38:02 +02:00
spinerak
7c2b3df617 Testing if I change the generate.py 2024-05-25 00:37:33 +02:00
spinerak
7c1a68ad3b changed options and added exceptions 2024-05-25 00:32:35 +02:00
spinerak
ae68fa0109 Extra categories are now working! 🐶 2024-05-24 23:33:22 +02:00
spinerak
55821d0e05 Added item categories 2024-05-24 21:55:25 +02:00
spinerak
f19689f27e Added alt categories, also options 2024-05-24 21:25:21 +02:00
spinerak
59e8f30d52 Now you can have 0 extra fragments 2024-05-24 20:34:54 +02:00
spinerak
c94f231bf2 added zillion again... 2024-05-24 20:07:43 +02:00
spinerak
4903fb8d49 Update .gitignore 2024-05-24 20:07:14 +02:00
spinerak
fe196db0be Removed zillion because it doesn't work 2024-05-24 20:06:24 +02:00
spinerak
10ea81dc41 Update .gitignore 2024-05-24 20:05:07 +02:00
spinerak
89b6d2e40b Add the yacht dice (from other git) world to the yacht dice fork 2024-05-24 20:02:25 +02:00
Exempt-Medic
18390ecc09 Witness: Fix option description (#3396) 
* Fixing description

* Another mistake
 2024-05-24 19:32:23 +02:00
Aaron Wagener
8045c8717c Webhost: Allow Option Groups to specify whether they start collapsed (#3370) 
* allow option groups to specify whether they should be hidden or not

* allow worlds to override whether game options starts collapsed

* remove Game Options assert so the visibility of that group can be changed

* if "Game Options" or "Item & Location Options" groups are specified, fix casing

* don't allow item & location options to have duplicates of the auto added options

* use a generator instead of a comprehension

* use consistent naming
 2024-05-24 01:18:21 -04:00
NewSoupVi
613e76689e CODEOWNERS: Actually link the correct person for Yu Gi Oh (#3389) 2024-05-23 20:25:41 -05:00
Exempt-Medic
2a47f03e72 Docs: Update trigger guide and advanced yaml guide (#3385) 
* I guess these don't exist anymore

* Update worlds/generic/docs/advanced_settings_en.md

Co-authored-by: Scipio Wright <scipiowright@gmail.com>

---------

Co-authored-by: Scipio Wright <scipiowright@gmail.com>
 2024-05-23 20:36:45 -04:00
Aaron Wagener
8b992cbf00 Webhost: Disallow empty option groups (#3369) 
* move item_and_loc_options out of the meta class and into the Options module

* don't allow empty world specified option groups

* reuse option_group generation code instead of rewriting it

* delete the default group if it's empty

* indent
 2024-05-23 18:50:40 -04:00
Doug Hoskisson
d09b214309 Core: Utils.py typing (#3064) 
* Core: Utils.py typing

`get_fuzzy_results` typing

There are places that this is called with a `word_list` that is not a `Sequence`, and it is valid (e.g., `set` or `dict`).

To decide the right type, we look at how `word_list` is used:
- the parameter to `len` - requires `__len__`
- the 2nd parameter to `map` - requires `__iter__`

Then we look at https://docs.python.org/3/library/collections.abc.html#collections-abstract-base-classes and ask what is the simplest type that includes both `__len__` and `__iter__`: `Collection`

(Python 3.8 requires using the alias in `typing`, instead of `collections.abc`)

* a bit more typing and cleaning

* fine, take away my fun for something that no one is ever going to see anyway...

Co-authored-by: black-sliver <59490463+black-sliver@users.noreply.github.com>

---------

Co-authored-by: black-sliver <59490463+black-sliver@users.noreply.github.com>
 2024-05-23 19:55:45 +02:00
Fabian Dill
860ab10b0b Generate: remove tag "-" (#3036) 
* Generate: introduce Remove, similar to Merge

* make + dict behave as + for each value


---------

Co-authored-by: Zach Parks <zach@alliware.com>
 2024-05-23 15:03:21 +02:00
CookieCat
3f8c348a49 AHIT: Fix Your Contract has Expired being placed on the first level when it shouldn't (#3379) 2024-05-23 09:49:17 +02:00
Zach Parks
e1ff5073b5 WebHost, Core: Move item and location descriptions to WebWorld responsibilities. (#2508) 
Co-authored-by: Doug Hoskisson <beauxq@users.noreply.github.com>
Co-authored-by: el-u <109771707+el-u@users.noreply.github.com>
 2024-05-23 02:08:08 -05:00
Star Rauchenberger
8b6eae0a14 Lingo: Add option groups (#3352) 
* Lingo: Add option groups

* Touched up option docstrings
 2024-05-23 02:22:39 +02:00
agilbert1412
89d0dae299 Stardew valley: Create Option Groups (#3376) 
* - Fix link in Stardew Setup Guide

* - Create option groups for Stardew Valley

* - Cleaned up the imports

* - Fixed double quotes and trailing comma

* - Improve order in the multipliers category
 2024-05-23 02:22:28 +02:00
LiquidCat64
56d01f3913 CV64: Add option groups (#3360) 
* Add the option groups.

* Get rid of all mid-sentence line breaks.
 2024-05-23 02:16:13 +02:00
Scipio Wright
a43e294786 TUNIC: Add option presets (#3377) 
* Add option presets

* why the hell is there an s here

* entrance rando yes
 2024-05-23 02:12:59 +02:00
Justus Lind
92392c0e65 Update Song List to Muse Dash 4.3.0 (#3216) 2024-05-23 02:11:27 +02:00
Star Rauchenberger
893a157b23 Lingo: Minor logic fixes (part 2) (#3250) 
* Lingo: Minor logic fixes (part 2)

* Update the datafile

* Renamed Fearless Mastery

* Move Rhyme Room LEAP into upper room

* Rename Artistic achievement location

* Fix broken wondrous painting

* Added a test for the Wondrous painting thing
 2024-05-23 02:09:52 +02:00
Scipio Wright
02d3fdf2a6 Update options to look better on webhost after update, also give death link a description (#3329) 2024-05-23 02:05:21 +02:00
Bryce Wilson
cd160842ba BizHawkClient: Linting/style (#3335) 2024-05-23 02:03:42 +02:00
Bryce Wilson
93f63a3e31 Pokemon Emerald: Fix broken Markdown in spanish setup guide (#3320) 
* Pokemon Emerald: Fix broken Markdown in spanish setup guide

* Pokemon Emerald: Minor formatting in spanish setup guide

* oops
 2024-05-23 02:01:27 +02:00
Scipio Wright
b4fec93c82 Update guide with some linux instructions (#3330) 2024-05-23 02:00:06 +02:00
Exempt-Medic
1ae0a9b76f WebHost: Fixing default values for LocationSets (#3374) 
* Update macros.html

* Update macros.html
 2024-05-23 01:58:06 +02:00
Fabian Dill
0ea20f3929 Core: add panic_method setting (#3261) 2024-05-22 14:02:18 +02:00
PoryGone
20134d3b1e Celeste 64: Option Groups (#3321) 
* Celeste 64: Option Groups

* Retarget OptionGroup import
 2024-05-21 18:22:39 -04:00
PoryGone
a1c2e8715e DKC3: Option Groups (#3322) 
* DKC3: Option Groups

* Retarget OptionGroup import
 2024-05-21 18:19:37 -04:00
NewSoupVi
61be79b7ea The Witness: Option Groups & Tooltip formatting (#3342) 
* Add option groups

* Option tooltip formatting

* eof

* reindent, apparently I'm stupid

* lint

* oops indent
 2024-05-21 18:17:12 -04:00
Scipio Wright
e7544d835c TUNIC: Add option groups, fix option descriptions (#3344) 
* Add option groups, fix up option descriptions

* Change sword progression description back

* Add missed newline change, missed space after asterisk
 2024-05-21 18:12:52 -04:00
PoryGone
62e68ba1cc SMW: Option Groups and Presets (#3345) 
* SMW: Add Option Groups and Presets

* Fix Boss Shuffle Preset

* Tooltip formatting
 2024-05-21 18:09:05 -04:00
Trevor L
9441cc31b7 Hylics 2: Update option docstrings (#3359) 
* Update Options.py

* "pool" -> "item pool"
 2024-05-21 17:53:00 -04:00
PoryGone
5c66681233 SA2B: Option Groups and Dataclass (#3357) 
* Merge Conflicts

* SA2B: Option Groups

* Re-add erroneously-removed import
 2024-05-21 17:48:23 -04:00
Trevor L
92b1f3cd19 Bomb Rush Cyberfunk: Update option docstrings (#3358) 
* Update Options.py

* Update Options.py
 2024-05-21 17:31:01 -04:00
jamesbrq
514ad69f44 Remove logging from validate_rom (#3362) 2024-05-21 20:57:59 +02:00
Fabian Dill
461f5db35a Customserver: only save on exit if it's in a good state. (#3351) 2024-05-21 14:08:59 +02:00