Scipio Wright
563d3daa00
Fix issues after merge
2024-08-30 22:03:35 -04:00
Scipio Wright
4c2ef0a633
Merge remote-tracking branch 'refs/remotes/origin/main' into tunc-portal-direction-pairing
...
# Conflicts:
# worlds/tunic/__init__.py
# worlds/tunic/er_rules.py
# worlds/tunic/rules.py
2024-08-13 21:02:16 -04:00
Scipio Wright
0af31c71e0
TUNIC: Swap from multiworld.get to world.get for applicable things ( #3789 )
...
* Swap from multiworld.get to world.get for applicable things
* Why was this even here in the first place?
2024-08-14 02:35:08 +02:00
Scipio Wright
55a51acb5b
Actually make UT work
2024-08-10 19:29:47 -04:00
Scipio Wright
de77886115
Remove debug print
2024-08-10 19:28:00 -04:00
Scipio Wright
2fa2bf7036
Fix parsing shop names in UT
2024-08-10 19:23:34 -04:00
Scipio Wright
8685758702
Merge branch 'main' into tunc-portal-direction-pairing
2024-08-10 15:13:47 -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
7ce43df0b6
Remove unused safety thing
2024-08-09 18:10:30 -04:00
Scipio Wright
fc80375cdd
Add todo note
2024-08-09 17:33:36 -04:00
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
cf6661439e
TUNIC: Sort entrances in the spoiler log ( #3733 )
...
* Sort entrances in spoiler log
* Rearrange portal list to closer match the vanilla game order, for better spoiler and because I already did this mod-side
* Add break (thanks vi)
2024-08-07 18:18:50 +02: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
eaec41d885
TUNIC: Fix event region for Quarry fuse ( #3635 )
2024-07-11 22:44:29 +02: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
e7a8e195e6
TUNIC: Use fewer parameters in helper functions ( #3356 )
...
* Clean these functions up, get the hell out of here 5 parameter function
* Clean up a bunch of rules that no longer need to be multi-lined since the functions are shorter
* Clean up some range functions
* Update to use world instead of player like Vi recommended
* Fix merge conflict
* Fix after merge
2024-07-05 22:50:12 +02: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
