Commit Graph

68 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
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
21bbf5fb95 TUNIC: Add note to Universal Tracker stuff #3772 2024-08-12 00:24:30 +02: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
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
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
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
65def8062e make direction pairs work 2024-08-06 22:24:22 -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
9dc352f829 Swap to using logicmixin instead of prog_items (thanks Vi) 2024-08-04 17:51:19 -04:00
Scipio Wright
984e9d5df3 Remove unused thing 2024-08-04 15:57:47 -04:00
Scipio Wright
5c819bb8c6 Condense the stuff in change and remove to less lines (thanks medic) 2024-08-04 15:49:24 -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
c24c43d62e Add option check for collect and remove 2024-07-31 09:31:17 -04:00
Scipio Wright
6084c51ac0 Save even more time, still never going to do this again on anything else 2024-07-30 21:27:56 -04:00
Scipio Wright
89cf7c2997 Mess with state with collect and remove to save like 2 seconds (never again) 2024-07-30 20:44:53 -04:00
Scipio Wright
b5b70ec170 Add entrance layout to the UT regen stuff 2024-07-28 12:51:05 -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
281ea82455 Merge branch 'main' into tunc-combat-logic 2024-07-27 17:33:19 -04:00
Scipio Wright
e38f5d0a61 TUNIC: Update plando connection option call to use options API #3695 2024-07-27 23:17:59 +02:00
Silent
ea1bb8d927 TUNIC: Missing slot data bugfix (#3628)
* Fix certain items not being added to slot data

* Change where items get added to slot data
2024-07-24 14:37:18 +02:00
Scipio Wright
a443aa01fc Merge branch 'main' into tunc-combat-logic 2024-07-23 17:43:19 -04:00
Scipio Wright
86df1a9014 Update some comments 2024-07-23 09:52:34 -04:00
Silent
ed4ad386e8 TUNIC: Add setting to disable local spoiler to host yaml (#3661)
* Add TunicSettings class for host yaml options

* Update __init__.py

* Update worlds/tunic/__init__.py

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

* Use self.settings

* Remove unused import

---------

Co-authored-by: Scipio Wright <scipiowright@gmail.com>
2024-07-23 09:04:24 +02:00
Scipio Wright
c5344e20d2 Fix create_item classification 2024-07-21 09:58:16 -04:00
Scipio Wright
db567c3c76 Merge Silent's missing slot data bugfix PR #3628 2024-07-15 10:02:03 -04:00
Scipio Wright
685d3369d6 Add combat logic to slot data 2024-07-15 09:58:45 -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
709606a140 Fix tiny issues 2024-07-04 20:25:47 -04:00
Scipio Wright
560bfe5d32 Add the rules for the boss-only option 2024-07-04 20:02:12 -04:00
Scipio Wright
084dcb6009 Item classification varies based on option 2024-07-04 18:17:50 -04:00
Scipio Wright
d4e2ad9177 Create the combat logic option 2024-07-04 17:47:56 -04:00
Scipio Wright
bd21a6173e Merge branch 'main' into tunc-logic-rules-redux 2024-06-29 19:27:39 -04:00
Silent
55cb81d487 TUNIC: Update victory condition (#3579)
* Add hero relics to victory condition

* Update __init__.py

* Remove unneeded local variables for options

* Use has_group_unique

* fix spacing
2024-06-30 01:17:00 +02:00
Scipio Wright
a76d9f8a57 Remove debug stuff 2024-06-15 17:17:57 -04:00
Scipio Wright
f5d8cfb710 Shops my beloved 2024-06-15 15:26:47 -04:00
Scipio Wright
985c02de38 Finishing out hooking the new rules into the code 2024-06-14 19:41:23 -04:00
Scipio Wright
b146b165a1 Update slot data and UT stuff 2024-06-12 20:11:37 -04:00
Scipio Wright
987b2920a6 Merge branch 'main' into tunc-cleanup-rules 2024-06-04 15:22:52 -04:00