Commit Graph

247 Commits

Author SHA1 Message Date
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
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
676cebb22c Move Direction above Portal 2024-07-31 11:23:25 -04:00
Scipio Wright
83c02981dc Update direction in Portal with default 2024-07-31 11:18:32 -04:00
Scipio Wright
34080476ef Add directions to shop portals 2024-07-31 11:17:06 -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
d5a138a947 Update ladder storage without items option description 2024-07-30 17:45:47 -04:00
Scipio Wright
1ced152e8d Update per Medic's suggestion 2024-07-30 17:36:21 -04:00
Scipio Wright
6848fc5082 Add combat rule for zig front to back 2024-07-30 11:49:19 -04:00
Scipio Wright
4395ce31bb Finish adding all of the directions 2024-07-30 10:36:36 -04:00
Scipio Wright
ec4dcdb57c Got like half of them in 2024-07-29 23:15:22 -04:00
Scipio Wright
06d1ace227 Remove unused elevation from portal class 2024-07-28 12:59:13 -04:00
Scipio Wright
7c6f8172fd Put direction. in, will add them later 2024-07-28 12:57:39 -04:00
Scipio Wright
b5b70ec170 Add entrance layout to the UT regen stuff 2024-07-28 12:51:05 -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
8f422572a6 Fix missed fixed shop -> entrance layout spot 2024-07-28 12:44:41 -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
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
Scipio Wright
640ec8a835 Add combat logic to the well boss fight, reorder the combat logic stuff a little to better section them off 2024-07-27 17:16:40 -04: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
b78b64ad60 Update per exempt's suggestion 2024-07-23 19:31:19 -04: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
b840c3fe1a TUNIC: Move 3 locations to Quarry Back (#3649)
* Move 3 locations to Quarry Back

* Change the non-er region too
2024-07-23 00:43:41 +02:00
Scipio Wright
c5344e20d2 Fix create_item classification 2024-07-21 09:58:16 -04:00
Scipio Wright
06ce0920cf Adjust combat logic to deal with weird edge cases so it doesn't take stuff out of logic that was previously in logic 2024-07-17 17:06:07 -04:00
Scipio Wright
0b5cacdda3 Add test for a problematic connection 2024-07-17 16:13:53 -04:00
Scipio Wright
d4ce12c67a Update gauntlet rule to hard-require a sword 2024-07-17 16:03:11 -04:00
Scipio Wright
27f132d4cd Remove redundant rule 2024-07-16 23:04:55 -04:00
Scipio Wright
8d2fb0625e Fix accidentally removed librarian rule 2024-07-16 23:02:09 -04:00
Scipio Wright
d02966a682 Fix lower zig ls rule 2024-07-15 15:21:10 -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