Commit Graph

2746 Commits

Author SHA1 Message Date
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
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
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
41f9d8229e Merge branch 'main' into tunc-combat-logic 2024-07-29 10:12:09 -04:00
qwint
e764da3dc6 HK: Options API updates, et al. (#3428)
* updates HK to consistently use world.random, use world.options, don't use world = self.multiworld, and remove some things from the logicMixin

* Update HK to new options dataclass

* Move completion condition helpers to Rules.py

* updates from review
2024-07-28 23:27:39 +02:00
CaitSith2
ab0903679c Factorio: Fix ap-get-technology nil value crashes (#3517) 2024-07-28 20:57:10 +02: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
Star Rauchenberger
67f329b96f Lingo: Add warpless connection between Hedge Maze and The Incomparable (#3703)
These areas are technically connected through The Observant, but the connection between The Observant and The Incomparable is marked as a warp because of the warp hallways leading up to The Observant's achievement panel. Creating separate entrances for The Incomparable is a simple workaround, and allows use of that connection during a pilgrimage.
2024-07-28 17:41:57 +02:00