github/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-08-23 06:35:33 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

rando: always spawn guard behind gate (also fix gaurd typos)

Browse source 
someone had seed where they had card so couldn't be caught to pass gate in reverse wasteland
This commit is contained in:
Demur Rumed 2025-04-13 20:49:53 +00:00
commit 3807e5690a
2 changed files with 3 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
soh/soh/Enhancements/randomizer/hook_handlers.cpp
View file

@ -982,7 +982,7 @@ void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, va_l
break; break;
} }
case VB_BIGGORON_CONSIDER_TRADE_COMPLETE: { case VB_BIGGORON_CONSIDER_TRADE_COMPLETE: {
// This being true will prevent other biggoron trades, there are already safegaurds in place to prevent // This being true will prevent other biggoron trades, there are already safeguards in place to prevent
// claim check from being traded multiple times, so we don't really need the quest to ever be considered // claim check from being traded multiple times, so we don't really need the quest to ever be considered
// "complete" // "complete"
*should = false; *should = false;

7
soh/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c
View file

@ -98,11 +98,8 @@ void EnGe1_Init(Actor* thisx, PlayState* play) {
EnGe1* this = (EnGe1*)thisx; EnGe1* this = (EnGe1*)thisx;
// When spawning the gate operator, also spawn an extra gate operator on the wasteland side // When spawning the gate operator, also spawn an extra gate operator on the wasteland side
if (IS_RANDO && if (IS_RANDO && (this->actor.params & 0xFF) == GE1_TYPE_GATE_OPERATOR) {
(Randomizer_GetSettingValue(RSK_SHUFFLE_GERUDO_MEMBERSHIP_CARD) || // Spawn the extra guard with params matching the custom type added (0x0300 + 0x02)
Randomizer_GetSettingValue(RSK_SHUFFLE_OVERWORLD_ENTRANCES)) &&
(this->actor.params & 0xFF) == GE1_TYPE_GATE_OPERATOR) {
// Spawn the extra gaurd with params matching the custom type added (0x0300 + 0x02)
Actor_Spawn(&play->actorCtx, play, ACTOR_EN_GE1, -1358.0f, 88.0f, -3018.0f, 0, 0x95B0, 0, Actor_Spawn(&play->actorCtx, play, ACTOR_EN_GE1, -1358.0f, 88.0f, -3018.0f, 0, 0x95B0, 0,
0x0300 | GE1_TYPE_EXTRA_GATE_OPERATOR, true); 0x0300 | GE1_TYPE_EXTRA_GATE_OPERATOR, true);
} }