mirror
/
Shipwright
mirror of https://github.com/HarbourMasters/Shipwright.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
1,174 Commits 3 Branches 36 Tags 136 MiB
Commit Graph

404 Commits

Author SHA1 Message Date
briaguya 4f109178ff Merge branch 'develop-flynn' into flynn-to-dev 2022-12-06 21:29:27 -05:00
Amaro Martínez 52b896271c
Fix Ganondorf boss battle ending (MQ only) (#2072) 2022-12-06 19:24:09 -05:00
Adam Bird d9f3844b2d
[Feature] Entrance Rando v2 (#2071) 2022-12-07 00:37:50 +01:00
PurpleHato 7f4a19461c
ADD: Rando German Custom Messages (#2102) 
* ADD: Rando German Custom Messages

Thanks to Timmy_GamerNepgear on Discord for the translation, I basically just formatted the text

* TWEAK: Forgot a small breakline
 2022-12-06 22:54:54 +01:00
PurpleHato b8465a9ef9
TWEAK: Rando french typos 2022-12-06 15:00:55 -05:00
aMannus 598cac725e
[Feature] Rando: Enemy Randomizer V1 (#1781) 2022-12-06 10:33:50 +01:00
Oliver Schall d9a08d0747
Added bombchu minigame difficulty menu (#2080) 
* Added bombchu bowling difficulty menu

* Removed incorrect diff

* Added bombchu bowling difficulty presets

* Shortened cucco removal logic
 2022-12-06 01:17:20 -05:00
briaguya 3921f15264
use enum for boss keysanity (#2096) 
* use enum for boss keysanity

* merge

Co-authored-by: briaguya <briaguya@alice>
 2022-12-06 01:03:55 -05:00
briaguya 767b707a8c
use enum for keyrings (#2095) 
Co-authored-by: briaguya <briaguya@alice>
 2022-12-06 01:00:36 -05:00
briaguya dbfdb42406
use enum for hint clarity (#2092) 
Co-authored-by: briaguya <briaguya@alice>
 2022-12-06 01:00:24 -05:00
briaguya 541d1d35a4
use enum for shuffle scrubs (#2089) 
Co-authored-by: briaguya <briaguya@alice>
 2022-12-06 01:00:12 -05:00
briaguya ca4875befc
use enums for tokensanity (#2088) 
Co-authored-by: briaguya <briaguya@alice>
 2022-12-06 00:59:59 -05:00
briaguya a93728599d
use enum values for maps and compasses (#2086) 
Co-authored-by: briaguya <briaguya@alice>
 2022-12-06 00:59:48 -05:00
briaguya d03e876289
use enum for logic (#2098) 
Co-authored-by: briaguya <briaguya@alice>
 2022-12-06 00:37:07 -05:00
briaguya 4ee0ddaa15
use enum for language (#2097) 
Co-authored-by: briaguya <briaguya@alice>
 2022-12-06 00:36:53 -05:00
briaguya 1e0e80f580
use enum for hint distribution (#2093) 
Co-authored-by: briaguya <briaguya@alice>
 2022-12-06 00:36:28 -05:00
briaguya 8b96c023fb
use enum for gerudo keys (#2094) 
* use enum for gerudo keys

* don't use cvar that doesn't exist

Co-authored-by: briaguya <briaguya@alice>
 2022-12-06 00:36:13 -05:00
briaguya 52bf2d600b
use enum for gossip stone hints (#2091) 
Co-authored-by: briaguya <briaguya@alice>
 2022-12-06 00:35:59 -05:00
briaguya 306183aa1b
use enum for shuffle merchants (#2090) 
* use enum for shuffle merchants

* remove comment that isn't needed anymore

Co-authored-by: briaguya <briaguya@alice>
 2022-12-06 00:35:44 -05:00
briaguya 22c4b1afa3
use enum for shuffle songs (#2087) 
Co-authored-by: briaguya <briaguya@alice>
 2022-12-06 00:35:08 -05:00
briaguya 321e563c82
use enum for starting age (#2085) 
Co-authored-by: briaguya <briaguya@alice>
 2022-12-06 00:34:30 -05:00
briaguya acd07f2a07
add/use enum values for rando mq dungeon options (#2056) 
Co-authored-by: briaguya <briaguya@alice>
 2022-12-06 00:32:53 -05:00
aMannus d3bfc102fe
[Fix} Small Crowd Control fixes (#2061) 2022-12-06 06:28:50 +01:00
aMannus 5b5310ea92
Disable bunny hood NPC interactions with MM bunny hood on (#2058) 
* Disable bunny hood NPC interactions

* Enum
 2022-12-04 19:03:04 -05:00
aMannus d4aeb79341
Fix jabu skulltula check (#2062) 2022-11-30 10:13:00 -05:00
briaguya 8d398f7130
refactor: separate RandoOption enum, use max (#2055) 
* refactor: separate RandoOption enum, use max

* missed a couple magic array sizes

* couple more

Co-authored-by: briaguya <briaguya@alice>
 2022-11-30 01:40:55 -05:00
briaguya d6c528d9d0
use shopsanity enum (#2054) 
* enums for rainbow bridge

* reorder enum

* use enums for shopsanity

* remove space

Co-authored-by: briaguya <briaguya@alice>
 2022-11-30 00:30:51 -05:00
briaguya e193f0dc0e
enums for rainbow bridge (#2052) 
* enums for rainbow bridge

* reorder enum

Co-authored-by: briaguya <briaguya@alice>
 2022-11-29 23:41:46 -05:00
briaguya 00a862a252
use trial enum instead of magic numbers (#2039) 
* use trial enum instead of magic numbers

* simplify trial count/random trial logic

* set default to set number

Co-authored-by: briaguya <briaguya@alice>
 2022-11-29 22:43:05 -05:00
briaguya 06df45efc7
use forest enum values instead of magic numbers (#2038) 2022-11-30 02:32:22 +01:00
briaguya 17c6a3653c
use enum for keysanity (#2044) 2022-11-30 02:05:11 +01:00
briaguya b976ef58fe
use enum for ganon's boss key (#2046) 2022-11-30 02:01:41 +01:00
briaguya a15f89a3e4
Use enum values for ice trap setting (#2041) 
Co-authored-by: briaguya <briaguya@alice>
Co-authored-by: David Chavez <david@dcvz.io>
 2022-11-30 00:40:35 +01:00
briaguya aba034ef53
Use enum for links pocket, dungeon reward shuffle (#2045) 
Co-authored-by: briaguya <briaguya@alice>
 2022-11-30 00:37:53 +01:00
briaguya ec8ec8d322
Use enum for kak gate (#2043) 
Co-authored-by: briaguya <briaguya@alice>
Co-authored-by: David Chavez <david@dcvz.io>
 2022-11-30 00:33:38 +01:00
briaguya bfc0ca5388
Use enum values for item pool (#2042) 
* use enum values for item pool

* Update soh/soh/Enhancements/presets.h

Co-authored-by: Garrett Cox <garrettjcox@gmail.com>

Co-authored-by: briaguya <briaguya@alice>
Co-authored-by: Garrett Cox <garrettjcox@gmail.com>
 2022-11-30 00:31:59 +01:00
briaguya 7e9c5d428c
Use gerudo fortress enum (#2040) 
Co-authored-by: briaguya <briaguya@alice>
 2022-11-30 00:30:52 +01:00
Garrett Cox 3cb9f93ff4
[docs] Pull upstream updates: SetupDL (#2048) 2022-11-30 00:29:36 +01:00
Garrett Cox d7c3522142
[docs] Upstream updates 1 (#1955) 
* First round of upstream updates and commenting patternss

* Renames from z64player

* Renames from z64save

* Undo changes to legacy save struct

* Add missing reference from entrance rando

* Fixes from stat tracker

* More tweaks
 2022-11-30 00:28:57 +01:00
PurpleHato 453eb7af88
Missing space (#2024) 2022-11-28 18:21:25 -05:00
briaguya 5037b99740
rename 3drando dot enums to match soh enum naming (#2034) 2022-11-28 23:49:21 +01:00
Ada 9027d85671
TWEAK: Game controls menu simplification (#2007) 2022-11-28 23:45:07 +01:00
briaguya 0424c5aaf3
fix: rando door of time enum usage (#2032) 2022-11-28 22:41:33 +01:00
Garrett Cox 091b6a2987
[Fix] Issue with first two rainbow bridge settings getting swapped (#2023) 
Fixes #2022
 2022-11-26 19:39:45 +01:00
PurpleHato 80bb4577b0
Google Translation Strikes back (#2014) 2022-11-24 13:17:47 -05:00
sonoftunk bd54ac5d15
Removes duplicated rando option enum for merchant (#2008) 2022-11-23 21:05:48 -05:00
frizzle101101 d65718db85
fix int sliders to fill the window like float sliders (#1984) 
* fix int sliders to fill the window like float sliders

* add a spacer to make it consistent with float slider

* add a spacer to make it consistent with float slider

* adding pop width further constancy with float slider
 2022-11-23 16:14:11 -05:00
Oliver Schall 4526550e95
[Enhancement] Added checkbox to disable finishing difficulty behavior changes (#1990) 2022-11-23 13:43:06 +01:00
sonoftunk c3f51fef2a
[Format] Lines up checks in item_location (#2004) 2022-11-23 13:42:14 +01:00
Sarge-117 9c162fc0ec
Gameplay Stat Tracker V1 (#1986) 
* First test of gathering some gameplay stats

* timer changes and other stuff

* Move code to new files + rename

* Name change - gamePlayStats

* Finish rename, remove n64ddFlag checks

* Improve item get times

* Better time tracking, more stats,

* Put button under Enhancements

* Fix merge conflict

* Add pauseCount, fix bug with rando items

* Adjust inits/declarations

* step counter

* Name change: "itemGetTime" to "timestamp"

* Tidying + CI test

* Set up array for stat counts

* Macro

#define GAMEPLAYSTAT_TOTAL_TIME (gSaveContext.gameplayStats.playTimer / 2 + gSaveContext.gameplayStats.pauseTimer / 3)

* Add boss defeat timestamps

* Add sword swings, pots broken, bushes cut

* fix int type

* Add counts for enemies defeated

Broken down by enemy, with a total

* Add ammo used

* Hide breakdowns until count > 0

* Forgot Big Octo

* Count chests opened

* Update after LUS submodule

* Enemy count spacing

* Comments

* Count 3 mini Floormasters as 1 Floormaster

+ some cleanup

* Comments

* Colour coding for timestamps on quest items

i.e. medallions/stones/songs

* Move stat into the sohStats struct

+ rearrange the counts enum for easier addition of future counts

* Some documentation + count button presses

* Stop counting button presses when Ganon defeated

* Couple bugfixes

Add count for Gerudo Thief, fix step counter counting in some situations where it shouldn't

* Fix comment
 2022-11-22 20:04:40 -05:00