289 Commits

Author	SHA1	Message	Date
Scipio Wright	667a2fc82c	Make it so the shops show up in the entrance hints	2024-08-16 19:17:51 -04:00
Scipio Wright	f04f99cf3b	Fix typo from merge	2024-08-15 18:15:13 -04:00
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	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	f75a4e8a4f	multiworld. to world.	2024-08-13 20:59:41 -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	21bbf5fb95	TUNIC: Add note to Universal Tracker stuff #3772	2024-08-12 00:24:30 +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	defb5ec280	Add note to fixed shop	2024-08-10 15:04:39 -04:00
Scipio Wright	6f20c8a262	Fix weird edge case that is technically user error	2024-08-09 21:33:29 -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	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	56e3b12f68	Fix exception text to be shorter	2024-08-09 10:37:46 -04:00
Scipio Wright	58be6d2077	Fix typo	2024-08-09 10:30:53 -04:00
Scipio Wright	6eedd5582b	Update plando checking for decoupled	2024-08-09 10:28:08 -04:00
Scipio Wright	cbcc14c791	Handle plando connections and direction pair errors	2024-08-08 23:33:00 -04:00
Scipio Wright	1a59087d8a	Fix bug with vanilla portals	2024-08-08 22:42:56 -04:00
Scipio Wright	32f2f14a5f	Add test with full-shop plando	2024-08-08 22:14:03 -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	bb169717f9	Reorder portal list	2024-08-08 14:18:26 -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	6297a4efa5	TUNIC: Fix missing traversal req #3740	2024-08-07 18:01:41 +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	fac2366d2f	Add outlet regions, create new regions as needed for them	2024-08-04 22:34:17 -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	e6091632cc	Make it actually return false if it gets to the backup lists and fails them	2024-08-04 20:00:48 -04:00
Scipio Wright	5170898a77	Making the fix better (thanks medic)	2024-08-04 18:46:11 -04:00
Scipio Wright	f411d6d6cd	Fix mistake when adding back	2024-08-04 18:40:24 -04:00
Scipio Wright	c193cf9dd6	Add back something that was needed	2024-08-04 18:37:25 -04:00
Scipio Wright	cfb0127f05	Fix consistency in stat counters	2024-08-04 18:18:31 -04:00