Commit Graph

54 Commits

Author SHA1 Message Date
Scipio Wright
ccaedd8fe6 Add some more comments 2024-08-09 17:25:04 -04:00
Scipio Wright
1a59087d8a Fix bug with vanilla portals 2024-08-08 22:42:56 -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
977848f4b5 Fix typo 2024-08-08 14:48:05 -04:00
Scipio Wright
90259e8134 Some cleanup of prints and functions 2024-08-08 14:42:05 -04:00
Scipio Wright
5755c98ab7 Add missing parameter 2024-08-08 14:28:01 -04:00
Scipio Wright
dcb560b88e Update portal sorter for variable shops 2024-08-08 14:24:58 -04:00
Scipio Wright
3d93846f19 god i love programming 2024-08-07 22:45:25 -04:00
Scipio Wright
8859748034 Fix plando 2024-08-07 21:44:15 -04:00
Scipio Wright
8902b615c3 Fix a few minor bugs 2024-08-07 21:15:39 -04:00
Scipio Wright
d0c9868f91 Fix a few minor bugs 2024-08-07 20:21:11 -04:00
Scipio Wright
79abca69da Make fixed shop work again 2024-08-06 23:04:43 -04:00
Scipio Wright
c7d85111fd Make decoupled work 2024-08-06 22:40:20 -04:00
Scipio Wright
65def8062e make direction pairs work 2024-08-06 22:24:22 -04:00
Scipio Wright
a7c5b3e112 Put together part of decoupled and direction pairs 2024-08-04 22:55:36 -04:00
Scipio Wright
7d2a150bc2 Fix stuff after merge 2024-08-04 21:58:03 -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
6655b0a3d3 Merge, implement verify plando directions 2024-08-03 15:01:32 -04:00
Scipio Wright
f45f3cfc1a Add decoupled option, mess with plando connection stuff 2024-08-03 14:55:31 -04:00
Scipio Wright
34080476ef Add directions to shop portals 2024-07-31 11:17:06 -04:00
Scipio Wright
8679ff2b9e Fix bug in seed groups with fixed shop on and off 2024-07-28 12:47:35 -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
7300f64a77 Fix secret gathering place issue 2024-07-15 14:07:38 -04:00
Scipio Wright
aecf3c8257 Fix secret gathering place issue 2024-07-15 14:01:43 -04:00
Scipio Wright
77827197f6 Remove test combat option 2024-07-15 10:07:11 -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
efdaeb29f1 Slight wording changes 2024-07-12 18:13:26 -04:00
Scipio Wright
b29d64c51b Don't make zig skip if er or fixed shop is off 2024-07-12 15:18:22 -04:00
Scipio Wright
2ec597f668 Update to filter out unreachable regions outside of ER 2024-07-11 16:27:51 -04:00
Scipio Wright
24790b2b92 West Garden combat logic 2024-07-10 23:43:05 -04:00
Scipio Wright
6123b8dfe4 Make temp option for testing logic 2024-07-08 21:19:16 -04:00
Scipio Wright
d1a602af60 Fix extremely rare bug 2024-06-16 11:41:20 -04:00
Scipio Wright
bdde992c25 Change victory condition back 2024-06-15 17:16:01 -04:00
Scipio Wright
f5d8cfb710 Shops my beloved 2024-06-15 15:26:47 -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
e31412040b Add well rail to the rules 2024-06-13 22:59:06 -04:00
Scipio Wright
987b2920a6 Merge branch 'main' into tunc-cleanup-rules 2024-06-04 15:22:52 -04:00
Scipio Wright
70e9ccb13c TUNIC: Fix plando connections, seed groups, and UT support (#3429) 2024-06-03 03:44:37 -05:00
Scipio Wright
fdebfa9d02 Merge branch 'main' into tunc-cleanup-rules 2024-06-01 12:35:34 -04: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
838f1f29f8 Clean these functions up, get the hell out of here 5 parameter function 2024-05-20 20:59:26 -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
6aafa6ff04 TUNIC: Fix minimal Heir access in ladder shuffle (#3189) 2024-04-21 17:00:16 +02:00
Scipio Wright
fb3035a78b TUNIC: Some cleanup (#3115) 2024-04-14 02:06:06 +02:00
Scipio Wright
c97215e0e7 TUNIC: Minor refactor of the vanilla_portals function (#3009)
* Remove unused, change an if to an elif

* Remove unused import
2024-03-28 22:23:37 +01: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