Commit Graph

2840 Commits

Author SHA1 Message Date
Malkierian
7a7eed74db
entrancesMap cleanup (#4905)
* Make spoiler entrancesMap use the same names and display scheme as the entrance tracker.

* Use `Entry` in place of grotto `Exit` and interior `Outside`.
2025-01-19 20:45:30 +01:00
aMannus
2a172de52a
Cosmetics Editor tweaks (#4904)
* Cosmetics Editor Tweaks

* More work on keys
2025-01-19 20:45:07 +01:00
Lord Jabu Jabu
3357543538 Dev Feature - Create VS Code Build tasks and update build documentation (#4895)
* Added vs code build tasks

* Fix typo in BUILDING.md regarding CMake Tools plugin

* Add "Build All" task to VS Code configuration
2025-01-19 13:49:23 -05:00
Fredrik Andréasson
27d9dd2c1a Corrected the 2 JJB locs 2025-01-19 07:28:35 +01:00
aMannus
c466c92905
Uncomment chime on one points (#4901) 2025-01-18 23:54:59 +01:00
Fredrik Andréasson
056b062aa7 Slightly less ghastly color 2025-01-18 21:44:14 +01:00
Fredrik Andréasson
0ac012f56d Hints and additional formatting 2025-01-18 21:03:28 +01:00
Eric Hoey
3061b138fa
pause menu behind advanced + remove from applysideeffects (#4903) 2025-01-18 19:54:52 +01:00
Fredrik Andréasson
6576bd49df Seperated the 2 KF bushes into 4 checks 2025-01-18 17:55:54 +01:00
Fredrik Andréasson
6e699e3e67 Workaround to allow market grass during night 2025-01-18 15:10:56 +01:00
Fredrik Andréasson
f3a0726159 Grottos done 2025-01-18 14:33:31 +01:00
Fredrik Andréasson
8bff058742 Merge branch 'main' into grassanity 2025-01-18 13:39:26 +01:00
Fredrik Andréasson
bc936c31d1 WIP grottos 2025-01-18 13:35:51 +01:00
aMannus
8a5dd022f6
Fix ice trap size not getting reset (#4897) 2025-01-18 11:46:59 +01:00
aMannus
188b9757da
Fix triforce hunt timer (#4896) 2025-01-18 11:46:48 +01:00
aMannus
b4f7d2289a
Play success sound on dropping in spoiler log (#4899) 2025-01-18 11:46:38 +01:00
aMannus
7d2a4e5818
Default "Hide unshuffled shop item checks" to off (#4900) 2025-01-18 11:46:01 +01:00
Archez
d1b7a5b814
Fix new Boss Soul skeleton based items (#4902)
* Fix and tweak boss soul skeleton patterns

* slow down morpha tex scroll

* extern c

* lower kotake a little
2025-01-18 11:45:21 +01:00
Fredrik Andréasson
586fbdd302 Added BotW + MQ locs 2025-01-18 10:41:38 +01:00
Fredrik Andréasson
9a89c6dd1e JJB done minus after big octo 2025-01-18 09:44:26 +01:00
Fredrik Andréasson
047b98cd9e Fixed DC incorrect pos value on 1 loc 2025-01-17 17:28:46 +01:00
Fredrik Andréasson
41b7870614 Added DC + MQ 2025-01-17 16:54:09 +01:00
Fredrik Andréasson
98646ad68f * removed comments in bush actor
* added rest of Deku Tree plus MQ
2025-01-17 02:40:40 +01:00
Fredrik Andréasson
58e24b3b07 Removed old WIP locacc files 2025-01-16 06:32:38 +01:00
Fredrik Andréasson
6df13afccf * forgot to rename the files to grassanity
* updated draw method to fix regrowing grass
2025-01-16 05:49:49 +01:00
Fredrik Andréasson
4cc675ab4b Merge remote-tracking branch 'origin/main' into grassanity 2025-01-16 04:12:24 +01:00
Fredrik Andréasson
4daa372561 * color is a sickly green when containing a check
* added ZR 14 (adult only bush on the platform, not the same?)
2025-01-16 04:09:19 +01:00
Pepper0ni
47fdaabd1b
Update Actor Flags to decomp (#4822) 2025-01-16 04:02:23 +01:00
Fredrik Andréasson
9ef6ce3af8 * renamed option and types to 'GRASSANITY'
* changed grassnity to be a combobox option
* added first 5 deku tree locations
2025-01-16 03:48:21 +01:00
Pepper0ni
88a432aac5
fix minor issues and a BotW rupee (#4888) 2025-01-16 03:26:11 +01:00
Fredrik Andréasson
57477f1b2d * fixed locations post-merge 2025-01-16 03:01:16 +01:00
Fredrik Andréasson
45796114e2 Merge latest from HM64 2025-01-16 02:07:05 +01:00
Fredrik Andréasson
b754479ef8 * Overworld pretty much done.
* Known issue with Market Night + 2 bushes in KF
* Known issue with Adult bush in ZR
2025-01-16 01:32:14 +01:00
aMannus
7f4344e28e
Fix mystery items applying to GI skipped items (#4886) 2025-01-16 00:12:30 +01:00
aMannus
a06b6c4365
check tracker typos (#4885) 2025-01-16 00:12:16 +01:00
aMannus
5ae527c194
Shuffle Fairies - Fix fairies spawning without playing song (#4884)
* Fix fairies spawning without playing song

* Better if statement
2025-01-15 23:12:06 +01:00
Jordan Longstaff
0497ad20d8
Rename Business Scrub functions/flags from decomp (#4776)
* Rename Business Scrub functions/flags from decomp

* Update XML references
2025-01-15 11:23:06 -05:00
aMannus
a86205b999
[RANDO] Boss Soul Shuffle using actual boss models (#4827)
* First pass for first 8 bosses

* Finish all souls
2025-01-15 15:26:44 +01:00
Pepper0ni
3e6a0ef566
Add Dana's models to the game, add cosmetic customisation for keys and rename Bombchus in Logic (#4311)
* initial implementation of new models

* fix typo

* Add smaller skeleton key model and try to fix windows build

* stupid windows, you made me look bad!

* make DrawBombchuBag function work

* small cleanups

* OOGGA BOOGA BOO

* fix post merge leftovers

* post merge fix

* Added Big Key Lighting override to show vanilla lighting when unchanged

* rename CustomdLists into customIconDLs

* post merge fixes

* fix some tooltip issues

* post merge cleanup and some small menu changes

* post merge fix

* post merge fix

* add new boss soul model, colours broken

* update boss soul model for env support

* Add dungeon customise buttons to cosmetic editor

* fix mac build?

* keys don't support alpha

* fix submodules

* ring now draws

* fix keyring colours

* Add bombchu Bag RG, fix boss soul skull colour

* address reviews
2025-01-15 14:18:52 +01:00
Pepper0ni
95a4e1cfba
Fix big poe bottle logic (#4837)
* fix big poe logic

* oops
2025-01-15 13:47:30 +01:00
Philip Dubé
d3c619ec2f
Fix ImgUI red boxes (#4869)
Invisible buttons needed unique IDs
2025-01-15 13:46:47 +01:00
Fredrik Andreasson
651623a845
[Rando] Prevent alarm when at full HP (#4831)
* * Prevent low HP alarm when at full HP for 1 heart start

* * updated name
2025-01-15 13:15:08 +01:00
Pepe20129
a46cfff438
Move some cheats to Shipinit (#4819)
* Infinite ammo

* Infinite health

* Infinite magic

* Infinite money

* Infinite Nayru's love

* Unrestricted items

* Freeze time

* Easy QPA

* Easy ISG

* Deku stick cheats

* Moon jump cleanup

* Update Ammo.cpp

* Address reviews
2025-01-15 13:08:33 +01:00
Pepper0ni
ce289c0be9
Properly store starting age in spoiler log (#4873)
* properly store starting age in spoiler log

* convert ResolvedStatingAge to a setting to store it in the save
2025-01-15 13:05:52 +01:00
Pepe20129
7f31fd2e4e
Organize ship specific save context additions (#4597)
* Basic restructure

* Undo most randomizerInf changes for now

* Small fixes

* Fix linux & mac builds?

* Fix remnants of randomizerInf changes

* Post-merge fix

* Post-merge fix
2025-01-15 13:04:47 +01:00
Malkierian
0d80c4695f
Change UnregisterGameHook type for freestanding handler to OnVanillaBehavior to match registration type. (#4883) 2025-01-14 21:49:49 -07:00
Pepper0ni
2fc3a563c9
fix spirit MQ south child climb chest logic (#4850) 2025-01-13 11:17:12 -07:00
briaguya
b774d39bc7
fix tooltip wonkyness (#4856) 2025-01-12 02:06:34 +01:00
Pepper0ni
66f5e6c26c
Fix generation errors exposed by loccacc refactor (#4861)
* Fix generation errors exposed by loccacc refactor

* oops
2025-01-12 01:50:50 +01:00
Eric Hoey
61de721fe5
Fix Skeleton Key Hint (#4860)
* add skeleton key hint text

* Update soh/soh/Enhancements/randomizer/3drando/hint_list/hint_list_item.cpp

Co-authored-by: PurpleHato <linkvssangoku.jr@gmail.com>

* Update soh/soh/Enhancements/randomizer/3drando/hint_list/hint_list_item.cpp

Co-authored-by: PurpleHato <linkvssangoku.jr@gmail.com>

* add end quote back, oops

---------

Co-authored-by: PurpleHato <linkvssangoku.jr@gmail.com>
2025-01-12 01:49:24 +01:00