Commit Graph

307 Commits

Author SHA1 Message Date
Scipio Wright
3915ec35da Add a failsafe for direction pairing 2024-09-20 20:25:51 -04:00
Scipio Wright
f3594fd005 has_stick -> has_melee 2024-09-18 14:50:36 -04:00
Scipio Wright
c9dccd406e has_stick -> has_melee 2024-09-18 14:50:13 -04:00
Scipio Wright
2d33882848 Merge branch 'main' into tunc-portal-direction-pairing 2024-09-18 14:45:18 -04:00
Scipio Wright
4ea1dddd2f TUNIC: Better logic for Library Lab glass and Fortress leaf piles #3880 2024-09-17 23:57:55 +02:00
Scipio Wright
84f0384132 Fix library mistake 2024-09-08 10:23:27 -04:00
Scipio Wright
dad228cd4a TUNIC: Logic Rules Redux (#3544)
* 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

* Create new options

* Slightly revise ls rule

* Update options.py

* Update options.py

* Add tedious option for ls

* Update laurels zips description

* Create new options

* Slightly revise ls rule

* Update options.py

* Update options.py

* Add tedious option for ls

* Update laurels zips description

* Creating structures to redo ladder storage rules

* Put together overworld ladder groups, remove tedious

* Write up the rules for the regular rules

* Update slot data and UT stuff

* Put new ice grapple stuff in er rules

* Ice grapple hard to get to fountain cross room

* More ladder data

* Wrote majority of overworld ladder rules

* Finish the ladder storage rules

* Update notes

* Add note

* Add well rail to the rules

* More rules

* Comment out logically irrelevant entrances

* Update with laurels_zip helper

* Add parameter to has_ice_grapple_logic for difficulty

* Add new parameter to has_ice_grapple_logic

* Move ice grapple chest to lower forest in ER/ladders

* Fix rule

* Finishing out hooking the new rules into the code

* Fix bugs

* Add more hard ice grapples

* Fix more bugs

* Shops my beloved

* Change victory condition back

* Remove debug stuff

* Update plando connections description

* Fix extremely rare bug

* Add well front -> back hard ladder storages

* Note in ls rules about knocking yourself down with bombs being out of logic

* Add atoll fuse with wand + hard ls

* Add some nonsense that boils down to activating the fuse in overworld

* Further update LS description

* Fix missing logic on bridge switch chest in upper zig

* Revise upper zig rule change to account for ER

* Fix merge conflict

* Fix formatting, fix rule for heir access after merge

* Add the shop sword logic stuff in

* Remove todo that was already done

* Fill out a to-do with some cursed nonsense

* Fix event in wrong region

* Fix missing cathedral -> elevator connection

* Fix missing cathedral -> elevator connection

* Add ER exception to cathedral -> elevator

* Fix secret gathering place issue

* Fix incorrect ls rule

* Move 3 locations to Quarry Back since they're easily accessible from the back

* Also update non-er region

* Remove redundant parentheses

* Add new test for a weird edge case in ER

* Slight option description updates

* Use has_ladder in spots where it wasn't used for some reason, add a comment

* Fix unit test for ER

* Update per exempt's suggestion

* Add back LogicRules as an invisible option, to not break old yamls

* Remove unused elevation from portal class

* Update ladder storage without items description

* Remove shop_scene stuff since it's no longer relevant in the mod by the time this version comes out

* Remove shop scene stuff from game info since it's no longer relevant in the mod by the time this comes out

* Update portal list to match main

* god I love github merging things

* Remove note

* Add ice grapple hard path from upper overworld to temple rafters entrance

* Actually that should be medium

* Remove outdated note

* Add ice grapple hard for swamp mid to the ledge

* Add missing laurels zip in swamp

* Some fixes to the ladder storage data while reviewing it

* Add unit test for weird edge case

* Backport outlet region system to fix ls bug

* Fix incorrect ls, add todo

* Add missing swamp ladder storage connections

* Add swamp zip to er data

* Add swamp zip to er rules

* Add hard ice grapple for forest grave path main to upper

* Add ice grapple logic for all bomb walls except the east quarry one

* Add ice grapple logic for frog stairs eye to mouth without the ladder

* Add hard ice grapple for overworld to the stairs to west garden

* Add the ice grapple boss quick kills to medium ice grappling

* Add the reverse connection for the ice grapple kill on Garden Knight

* Add atoll house ice grapple push, and add west garden ice grapple entry to the regular rules
2024-09-08 14:42:59 +02:00
Scipio Wright
0e801a8894 Merge branch 'main' into tunc-portal-direction-pairing 2024-08-31 18:18:59 -04:00
Scipio Wright
34a3b5f058 TUNIC: Add alias for Ladders in Overworld Town #3862 2024-08-31 23:37:18 +02:00
Scipio Wright
ee653d88a5 Update plando connections stuff in docs 2024-08-30 22:04:43 -04:00
Scipio Wright
563d3daa00 Fix issues after merge 2024-08-30 22:03:35 -04:00
Scipio Wright
2c264cd3d8 # Conflicts:
#	worlds/tunic/__init__.py
#	worlds/tunic/er_data.py
#	worlds/tunic/er_rules.py
#	worlds/tunic/er_scripts.py
#	worlds/tunic/rules.py
#	worlds/tunic/test/test_access.py
2024-08-30 21:55:20 -04:00
Scipio Wright
cbbd395012 Merge branch 'main' into tunc-portal-direction-pairing 2024-08-29 09:41:47 -04:00
Scipio Wright
08dc7e522e TUNIC: Add note about plando items to ER hint-creation failure error message (#3825)
* Add note about plando items to entrance rando option description

* Update error text to specifically call out plando items

* Remove option description change
2024-08-29 09:42:46 +02:00
Scipio Wright
81fd1ae88d Remove blank line 2024-08-17 14:08:31 -04:00
Scipio Wright
6dad2fe490 Fix bug in ladder storage rules 2024-08-17 13:17:45 -04:00
Scipio Wright
2527b0f950 Merge remote-tracking branch 'refs/remotes/origin/main' into tunc-portal-direction-pairing
# Conflicts:
#	worlds/tunic/er_data.py
#	worlds/tunic/er_rules.py
#	worlds/tunic/items.py
2024-08-16 19:53:38 -04:00
Scipio Wright
667a2fc82c Make it so the shops show up in the entrance hints 2024-08-16 19:17:51 -04:00
Scipio Wright
474a3181c6 TUNIC: Give the fox a gun (in logic) (very small PR) (#3790)
* Add bomb wall logic

* Remove option call from can_shop

* Gun for the envoy blocking Quarry

* has_sword -> can_shop on cube cave entrance region
2024-08-16 20:53:54 +02: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