Commit Graph

325 Commits

Author SHA1 Message Date
Scipio Wright
2fa92fd3eb Merge branch 'main' into tunc-portal-direction-pairing 2024-11-25 10:03:08 -05:00
Scipio Wright
a650e90b57 TUNIC: Add clarifying comment to item links handling #4233 2024-11-24 18:43:28 +01:00
Scipio Wright
5729b78504 TUNIC: Fix it so item linked locations are correct in slot data (#4105)
* Fix it so item linked locations are correct in slot data

* List -> Set

* Cache the locations instead

* Just loop the multiworld once

* Move it all to fill slot data and pretend we're doing a stage

* Move groups up so it doesn't loop over the multiworld locations if no item links are present

* Update worlds/tunic/__init__.py

Co-authored-by: Mysteryem <Mysteryem@users.noreply.github.com>

---------

Co-authored-by: Mysteryem <Mysteryem@users.noreply.github.com>
2024-11-23 01:42:44 +01:00
Scipio Wright
cf25e04c71 Merge branch 'main' into tunc-portal-direction-pairing 2024-11-18 09:13:55 -05:00
Scipio Wright
01c6037562 TUNIC: Fix a few missing tricks in logic (#4132)
* Add missing connection to the furnace entry by west garden

* Add missing connection to the furnace entry by west garden

* Add missing hard ls for ruined passage door

* Allow shield for LS

* Split PR into two

* Split PR into two

* Split PR into two

* Add dark tomb ice grapple through the wall
2024-11-18 14:39:58 +01:00
Mysteryem
f4072833f3 TUNIC: Add Shop indirect condition (#4160)
* TUNIC: Add Shop indirect condition

The `Overworld -> Cube Cave Entrance Region` Entrance checks
`can_shop()` which checks for being able to reach the "Shop" Region, so
the Entrance requires an indirect condition of reaching the "Shop"
Region.

* Rename entrance variable to cube_entrance

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

---------

Co-authored-by: Scipio Wright <scipiowright@gmail.com>
2024-11-08 18:57:11 +01:00
Scipio Wright
b6c58c5c24 TUNIC: Minor revision to IG and LS option descriptions #4115 2024-10-29 02:43:03 +01:00
Scipio Wright
594a8321c4 TUNIC: Add link to logic tricks doc (#4087)
* Add link to logic tricks doc

* Update worlds/tunic/docs/en_TUNIC.md

Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>

---------

Co-authored-by: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>
2024-10-28 23:19:57 +01:00
Scipio Wright
e46002fbf6 Merge branch 'main' into tunc-portal-direction-pairing 2024-10-23 09:27:08 -04:00
Scipio Wright
33daebef57 TUNIC: Add prog + useful to some items #4066 2024-10-23 02:30:31 +02:00
Scipio Wright
3a16d4b2d4 has_stick to has_melee in newer update 2024-10-01 10:16:23 -04:00
Scipio Wright
5a7826318d has_stick to has_melee in newer update 2024-10-01 10:16:02 -04:00
Scipio Wright
8cdf92c1ef Merge branch 'main' into tunc-portal-direction-pairing 2024-10-01 10:15:09 -04:00
Scipio Wright
b450551a27 Updates per code review (thanks hesto) 2024-10-01 09:59:00 -04:00
Scipio Wright
449782a4d8 TUNIC: Add forgotten Laurels rule for Beneath the Vault Boxes #3981 2024-09-22 16:21:10 +02:00
Scipio Wright
69d3db21df TUNIC: Deal with the boxes blocking the entrance to Beneath the Vault 2024-09-21 23:02:58 +02:00
Scipio Wright
9f29be301a Remove init from logicmixin 2024-09-21 12:16:51 -04:00
Scipio Wright
2288452836 Fix playthrough crash bug 2024-09-21 12:13:19 -04:00
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