Commit Graph

55 Commits

Author SHA1 Message Date
Scipio Wright
a2db2cec68 Merge branch 'main' into tunc-portal-direction-pairing 2024-08-14 23:14:46 -04:00
Scipio Wright
5e5f24cdd2 TUNIC: Add off and on aliases for the Entrance Rando option #3794 2024-08-14 16:55:02 +02:00
Scipio Wright
defb5ec280 Add note to fixed shop 2024-08-10 15:04:39 -04:00
Scipio Wright
b559422450 Make seed groups in decoupled with overlapping but not fully overlapped plando connections interact nicely without messing with what the entrances look like in the spoiler log 2024-08-09 20:59:03 -04:00
Scipio Wright
df0aa3c181 Remove extra plando connections definition in options 2024-08-09 18:59:38 -04:00
Scipio Wright
7ac0211cf0 Make seed groups not sync decoupled 2024-08-08 21:59:21 -04:00
Scipio Wright
0d7b03deac it's aliiiiiive 2024-08-08 20:34:30 -04:00
Scipio Wright
3d93846f19 god i love programming 2024-08-07 22:45:25 -04:00
Scipio Wright
d0c9868f91 Fix a few minor bugs 2024-08-07 20:21:11 -04:00
Scipio Wright
2200a1547f Merge remote-tracking branch 'refs/remotes/sw/tunc-combat-logic' into tunc-portal-direction-pairing
# Conflicts:
#	worlds/tunic/__init__.py
#	worlds/tunic/er_data.py
#	worlds/tunic/er_scripts.py
#	worlds/tunic/options.py
2024-08-04 20:07:39 -04:00
Scipio Wright
f45f3cfc1a Add decoupled option, mess with plando connection stuff 2024-08-03 14:55:31 -04:00
Scipio Wright
d5a138a947 Update ladder storage without items option description 2024-07-30 17:45:47 -04:00
Scipio Wright
f2f9eb308b Fix a bug with seed group, continue changing fixed shop to entrance layout 2024-07-28 12:40:29 -04:00
Scipio Wright
dc9bbad840 Add back LogicRules as an invisible option, to not break old yamls 2024-07-28 12:10:49 -04:00
Scipio Wright
52e968667a Add EntranceLayout option 2024-07-28 11:58:35 -04:00
Scipio Wright
19dbe860c9 Update combat logic description 2024-07-15 11:05:11 -04:00
Scipio Wright
7777846f62 Reword combat logic option description, remove test option 2024-07-15 09:54:26 -04:00
Scipio Wright
f2b7dbbb7d Fix bugs, refactor quarry regions so you can access chests in lower quarry with ice grapples 2024-07-12 19:12:11 -04:00
Scipio Wright
0092584fb6 Temporarily default combat logic on 2024-07-12 15:20:52 -04:00
Scipio Wright
7d1793c973 Add todo 2024-07-12 15:01:37 -04:00
Scipio Wright
4a67361e5a Update combat logic description 2024-07-12 14:21:23 -04:00
Scipio Wright
5d8156fda8 make unit tests checkmark again 2024-07-11 09:19:31 -04:00
Scipio Wright
694df957e2 Temporarily default combat logic to on 2024-07-10 11:11:23 -04:00
Scipio Wright
6123b8dfe4 Make temp option for testing logic 2024-07-08 21:19:16 -04:00
Scipio Wright
560bfe5d32 Add the rules for the boss-only option 2024-07-04 20:02:12 -04:00
Scipio Wright
d4e2ad9177 Create the combat logic option 2024-07-04 17:47:56 -04:00
Scipio Wright
e67ffc5610 Further update LS description 2024-06-17 09:50:52 -04:00
Scipio Wright
182a42df5b Note in ls rules about knocking yourself down with bombs being out of logic 2024-06-17 09:28:32 -04:00
Scipio Wright
c622240730 Tunc: Update plando connections description (#3545) 2024-06-16 05:02:48 +02:00
Scipio Wright
4d58597e0c Update plando connections description 2024-06-15 19:09:34 -04:00
Scipio Wright
5d4f46d6cb Fix more bugs 2024-06-15 14:30:57 -04:00
Scipio Wright
985c02de38 Finishing out hooking the new rules into the code 2024-06-14 19:41:23 -04:00
Scipio Wright
1f0dac222d More rules 2024-06-13 23:31:10 -04:00
Scipio Wright
21e3854425 Finish the ladder storage rules 2024-06-13 19:12:59 -04:00
Scipio Wright
10825f8a08 Write up the rules for the regular rules 2024-06-12 19:22:03 -04:00
Scipio Wright
f721926deb Put together overworld ladder groups, remove tedious 2024-06-12 13:56:02 -04:00
Scipio Wright
1b95330a62 Update laurels zips description 2024-06-11 19:09:30 -04:00
Scipio Wright
8b39268927 Add tedious option for ls 2024-06-11 19:09:30 -04:00
Scipio Wright
ce9d8b6164 Update options.py 2024-06-11 19:09:30 -04:00
Scipio Wright
39a494d06d Update options.py 2024-06-11 19:09:30 -04:00
Scipio Wright
53389be1e4 Slightly revise ls rule 2024-06-11 19:09:30 -04:00
Scipio Wright
b40c132905 Create new options 2024-06-11 19:09:30 -04:00
Scipio Wright
70e9ccb13c TUNIC: Fix plando connections, seed groups, and UT support (#3429) 2024-06-03 03:44:37 -05:00
Silvris
4e5b6bb3d2 Core: move PlandoConnections and PlandoTexts to the options system (#2904)
Co-authored-by: Doug Hoskisson <beauxq@users.noreply.github.com>
Co-authored-by: Scipio Wright <scipiowright@gmail.com>
Co-authored-by: beauxq <beauxq@yahoo.com>
Co-authored-by: alwaysintreble <mmmcheese158@gmail.com>
2024-06-01 06:34:41 -05: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
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
Scipio Wright
754fc11c1b TUNIC: ER Refactor for better plando connections, fewer shops improvement (#3075)
* Fixed shop changes

* Update option description

* Apply suggestions from Vi's review (thank you)

* Fix for plando connections on a full scene

* Plando connections should work better now for complicated paths

* Even more good plando connections yes

* Starting to move the info over

* Fixing up formatting a bit

* Remove unneeded item info

* Put in updated_reachable_regions, to replace add_dependent_regions

* Updated to match ladder shuffle

* More stuff I guess

* It functions!

* It mostly works with plando now, some slight issues still

* Fixed minor logic bug

* Fixed world leakage

* Change exception message

* Make exception message better for troubleshooting failed connections

* Merged with main

* technically a logic fix but it would never matter cause no start shuffle

* Add a couple more alias item groups cause yeah

* Rename beneath the vault front -> beneath the vault main

* Flip lantern access rule to the region

* Add missing connection to traversal reqs

* Move start_inventory_from_pool to the top so that it's next to start_inventory

* Reword the fixed shop description slightly

* Refactor per ixrec's comments

* Greatly reduced an overcomplicated block because Vi is cool and smart and also cool

* Rewrite traversal reqs thing per Vi's comments
2024-05-20 01:01:24 +02:00
Scipio Wright
26188230b7 TUNIC: Better seed groups for Entrance Rando (#2998)
* Update entrance rando description to discuss seed groups

* Starting off, setting up some names

* It lives

* Some preliminary plando connection handling, probably has errors

* Add missed comma

* if -> elif

* I think this is working properly to handle plando connections

* Update comments

* Fix up shop -> shop portal stuff

* Add back comma that got removed for no reason in the ladder PR

* Remove unnecessary if else

* add back the actually necessary if but not the else

* okay they were both necessary

* Update entrance rando description

* blasphemy

Co-authored-by: Silent <110704408+silent-destroyer@users.noreply.github.com>

* Rename other instances of tunc -> tunic

* Update per Vi's review (thank you)

* Fix a not that shouldn't have been

* Rearrange, update per Vi's comments (thank you)

* Fix indent

* Add a .value

* Add .values

* Fix bad comparison

* Add a not that was supposed to be there

* Replace another isinstance

* Revise option description

* Fix per Kaito's comment

Co-authored-by: Kaito Sinclaire <ks@rosenthalcastle.org>

---------

Co-authored-by: Silent <110704408+silent-destroyer@users.noreply.github.com>
Co-authored-by: Kaito Sinclaire <ks@rosenthalcastle.org>
2024-05-03 07:21:27 +02:00
Scipio Wright
14816743fc TUNIC: Shuffle Ladders option (#2919) 2024-03-21 16:50:07 +01:00
Scipio Wright
e6198585c8 TUNIC: Implement support for connection plando (#2864) 2024-03-15 17:52:05 +01:00