Commit Graph

1541 Commits

Author SHA1 Message Date
StructuralMike
b20127163a Merge pull request #1 from aerinon/DoorDevUnstable
Door dev unstable
2021-03-18 17:16:16 +01:00
StructuralMike
5b37b32c8d Revert "Revert "Update .gitignore""
This reverts commit 5073b9e630.
2021-03-18 16:33:25 +01:00
StructuralMike
5073b9e630 Revert "Update .gitignore"
This reverts commit f95270587f.
2021-03-18 16:19:42 +01:00
randall.rupper
27ed4ecd04 Small Shopsanity price adjustments
Fixed a subtle error with shop shields and progressive shields - should result in more successful generation
2021-03-17 14:37:39 -06:00
randall.rupper
7b9deb2190 Merge branch 'DoorDevUnstable' of https://github.com/Fouton/ALttPDoorRandomizer into Fouton-DoorDevUnstable
some refinements too

# Conflicts:
#	ItemList.py
2021-03-16 15:15:48 -06:00
randall.rupper
3c81e377e5 Fix for intensity 3 inverted lobbies if lobbies are chosen to be vanilla
Flooded pots not actually able to be flooded in some potshuffles
2021-03-16 14:23:52 -06:00
randall.rupper
7ef186134a Merge branch 'StructuralMike-TFH-fix' into DoorDevUnstable 2021-03-16 14:14:35 -06:00
StructuralMike
40119b3a5f Retro-Standard can't have bow on uncle
I don't know if the best solution is to exclude the bow from the options, or to have uncle give bow + arrows. I think the former is better as buying your arrow is part of retro.
2021-03-16 17:34:08 +01:00
StructuralMike
6bf3479e08 TFH playthrough fix
copy_world overwrites Murahdahla's logic and either needs to be reset through set_rules to work properly.
2021-03-16 14:15:56 +01:00
StructuralMike
9f00862e04 Merge branch 'DoorDevUnstable' of https://github.com/Aerinon/ALttPDoorRandomizer into DoorDevUnstable 2021-03-16 13:27:07 +01:00
StructuralMike
f95270587f Update .gitignore 2021-03-16 13:26:21 +01:00
Fouton
c47090ce61 Add files via upload 2021-03-12 22:15:27 -05:00
Fouton
1aa770e33a Add files via upload 2021-03-12 21:58:19 -05:00
Fouton
6526d1b877 Add files via upload 2021-03-12 21:48:51 -05:00
Fouton
05413011a9 Add files via upload 2021-03-12 21:46:54 -05:00
Fouton
d62b11742b Add files via upload 2021-03-12 21:45:27 -05:00
Fouton
08a5e2f27f Add files via upload 2021-03-12 21:22:35 -05:00
aerinon
749b94fa9f Merge pull request #97 from krelbel/chaosfix
Fix chaos boss/enemy shuffle
2021-03-12 16:33:48 -07:00
Fouton
2e07fc2dd0 Add files via upload 2021-03-12 16:57:42 -05:00
Fouton
0865288581 Add files via upload 2021-03-12 16:53:08 -05:00
Fouton
2a1eb07d73 Add files via upload 2021-03-12 16:51:16 -05:00
Fouton
1e63d3957d TFH Futures 2021-03-12 16:41:58 -05:00
Fouton
8d933b82de TFH Futures 2021-03-12 16:41:35 -05:00
krelbel
5210bbe4e0 Fix chaos boss/enemy shuffle
Update BaseClasses.py to make make_code()'s byte 6 handle "chaos" boss/enemy shuffle the same as "random".
2021-03-09 22:10:30 -08:00
randall.rupper
fd7728235d Fix for multiworld progression balancing with shopsanity off 2021-03-09 16:14:16 -07:00
randall.rupper
9a2474f8ca Merge branch 'DoorDevUnstable' of https://github.com/compiling/ALttPEntranceRandomizer into compiling-DoorDevUnstable 2021-03-09 13:40:52 -07:00
compiling
ef08bf33d5 Reset Skull Pinball logical state between generation attempts. 2021-03-06 12:26:58 +11:00
StructuralMike
25d24dc15f Update .gitignore 2021-03-05 21:04:30 +01:00
randall.rupper
dc5cd2b744 Merge branch 'DoorDev' into DoorDevUnstable
# Conflicts:
#	Main.py
#	RELEASENOTES.md
2021-03-05 10:43:05 -07:00
randall.rupper
b108398545 Make the adjust and "open output path" actions consistent v0.2.2-dev.48 2021-03-05 08:58:38 -07:00
randall.rupper
91c0114d32 Settings file added 2021-03-04 14:05:25 -07:00
randall.rupper
9a5be8644c Fixed Ganon's silver hints for shops 2021-03-04 11:11:55 -07:00
Thomas Prescott
e5b9019828 remove unused import 2021-03-03 08:02:50 -06:00
Thomas Prescott
1bac04a24c formatting, and fix output 2021-03-02 20:12:24 -06:00
Thomas Prescott
7674e7dafb hack in a thing to use a settings file for generation 2021-03-02 19:34:29 -06:00
aerinon
4e9e564154 Set theme jekyll-theme-slate 2021-03-01 10:04:05 -07:00
aerinon
6a5bdbee6b Mostly a fix for Blind outside of TT when Blind is the boss of TT (boss enemizer)
Remove RaceRandom use for now
2021-02-27 15:33:05 -07:00
aerinon
7c35b4d14e Minor gui bugfix 2021-02-26 11:26:04 -07:00
Mike A. Trethewey
f7df6c0e69 Fixes
Change Spoiler default to True
Set base rom to actually do the thing
2021-02-26 02:13:11 -08:00
Mike A. Trethewey
ff763c4542 Merge pull request #2 from aerinon/DoorDevUnstable
Update from Aerinon
2021-02-26 01:42:48 -08:00
aerinon
f6d1dc282b Minor bugfix update 2021-02-25 16:51:07 -07:00
aerinon
f1fd2c2759 Revert "Merge branch 'DoorDevUnstable' of https://github.com/miketrethewey/ALttPDoorRandomizer into miketrethewey-DoorDevUnstable"
This reverts commit 3448693f52, reversing
changes made to f2c021500d.
2021-02-25 16:16:20 -07:00
aerinon
af441a8e9b Merging in base er changes 2021-02-25 15:26:29 -07:00
aerinon
5dded84a4c Merge pull request #88 from KevinCathcart/Dev
Dev
2021-02-24 15:31:36 -07:00
aerinon
3448693f52 Merge branch 'DoorDevUnstable' of https://github.com/miketrethewey/ALttPDoorRandomizer into miketrethewey-DoorDevUnstable 2021-02-24 15:24:25 -07:00
aerinon
f2c021500d Merge branch 'Portals' of https://github.com/Catobat/ALttPDoorRandomizer into Catobat-Portals 2021-02-24 15:23:34 -07:00
aerinon
d14c9b5758 Object reading improvements in utils 2021-02-24 13:29:10 -07:00
Mike A. Trethewey
33d05c1b1f Fix Selectors 2021-02-23 01:38:10 -08:00
Mike A. Trethewey
37b778c71e Merge pull request #1 from aerinon/DoorDevUnstable
Update from Aerinon
2021-02-22 16:03:56 -08:00
aerinon
90d45cc371 Potion shop crash in non-shopsanity modes 2021-02-22 14:47:24 -07:00