github/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-08-26 08:05:21 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Rename events

Browse source
This commit is contained in:
Pepe20129 2025-03-15 20:01:35 +01:00
commit de1ef3963b
3 changed files with 20 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

8
soh/soh/Enhancements/randomizer/location_access/overworld/thieves_hideout.cpp
View file

@ -6,7 +6,7 @@ using namespace Rando;
void RegionTable_Init_ThievesHideout() { void RegionTable_Init_ThievesHideout() {
areaTable[RR_TH_NORTH_F1_CARPENTER_AREA] = Region("Thieves Hideout North F1 Carpenter Area", "Thieves Hideout", {RA_GERUDO_FORTRESS}, NO_DAY_NIGHT_CYCLE, { areaTable[RR_TH_NORTH_F1_CARPENTER_AREA] = Region("Thieves Hideout North F1 Carpenter Area", "Thieves Hideout", {RA_GERUDO_FORTRESS}, NO_DAY_NIGHT_CYCLE, {
//Events //Events
EventAccess(&logic->TH_RescuedF1NorthCarpenter, []{return logic->CanKillEnemy(RE_GERUDO_WARRIOR);}), EventAccess(&logic->TH_CouldRescueF1NorthCarpenter, []{return logic->CanKillEnemy(RE_GERUDO_WARRIOR);}),
}, { }, {
//Locations //Locations
LOCATION(RC_TH_NORTH_F1_CARPENTER, logic->CanKillEnemy(RE_GERUDO_WARRIOR)), LOCATION(RC_TH_NORTH_F1_CARPENTER, logic->CanKillEnemy(RE_GERUDO_WARRIOR)),
@ -22,7 +22,7 @@ void RegionTable_Init_ThievesHideout() {
areaTable[RR_TH_SOUTH_F1_CARPENTER_AREA] = Region("Thieves Hideout South F1 Carpenter Area", "Thieves Hideout", {RA_GERUDO_FORTRESS}, NO_DAY_NIGHT_CYCLE, { areaTable[RR_TH_SOUTH_F1_CARPENTER_AREA] = Region("Thieves Hideout South F1 Carpenter Area", "Thieves Hideout", {RA_GERUDO_FORTRESS}, NO_DAY_NIGHT_CYCLE, {
//Events //Events
EventAccess(&logic->TH_RescuedF1SouthCarpenter, []{return logic->CanKillEnemy(RE_GERUDO_WARRIOR);}), EventAccess(&logic->TH_CouldRescueF1SouthCarpenter, []{return logic->CanKillEnemy(RE_GERUDO_WARRIOR);}),
}, { }, {
//Locations //Locations
LOCATION(RC_TH_SOUTH_F1_CARPENTER, logic->CanKillEnemy(RE_GERUDO_WARRIOR)), LOCATION(RC_TH_SOUTH_F1_CARPENTER, logic->CanKillEnemy(RE_GERUDO_WARRIOR)),
@ -42,7 +42,7 @@ void RegionTable_Init_ThievesHideout() {
areaTable[RR_TH_NORTH_F2_CARPENTER_AREA] = Region("Thieves Hideout North F2 Carpenter Area", "Thieves Hideout", {RA_GERUDO_FORTRESS}, NO_DAY_NIGHT_CYCLE, { areaTable[RR_TH_NORTH_F2_CARPENTER_AREA] = Region("Thieves Hideout North F2 Carpenter Area", "Thieves Hideout", {RA_GERUDO_FORTRESS}, NO_DAY_NIGHT_CYCLE, {
//Events //Events
EventAccess(&logic->TH_RescuedF2NorhCarpenter, []{return logic->CanKillEnemy(RE_GERUDO_WARRIOR);}), EventAccess(&logic->TH_CouldRescueF2NorhCarpenter, []{return logic->CanKillEnemy(RE_GERUDO_WARRIOR);}),
}, { }, {
//Locations //Locations
LOCATION(RC_TH_NORTH_F2_CARPENTER, logic->CanKillEnemy(RE_GERUDO_WARRIOR)), LOCATION(RC_TH_NORTH_F2_CARPENTER, logic->CanKillEnemy(RE_GERUDO_WARRIOR)),
@ -56,7 +56,7 @@ void RegionTable_Init_ThievesHideout() {
areaTable[RR_TH_SOUTH_F2_CARPENTER_AREA] = Region("Thieves Hideout South F2 Carpenter Area", "Thieves Hideout", {RA_GERUDO_FORTRESS}, NO_DAY_NIGHT_CYCLE, { areaTable[RR_TH_SOUTH_F2_CARPENTER_AREA] = Region("Thieves Hideout South F2 Carpenter Area", "Thieves Hideout", {RA_GERUDO_FORTRESS}, NO_DAY_NIGHT_CYCLE, {
//Events //Events
EventAccess(&logic->TH_RescuedF2SouthCarpenter, []{return logic->CanKillEnemy(RE_GERUDO_WARRIOR);}), EventAccess(&logic->TH_CouldRescueF2SouthCarpenter, []{return logic->CanKillEnemy(RE_GERUDO_WARRIOR);}),
}, { }, {
//Locations //Locations
LOCATION(RC_TH_SOUTH_F2_CARPENTER, logic->CanKillEnemy(RE_GERUDO_WARRIOR)), LOCATION(RC_TH_SOUTH_F2_CARPENTER, logic->CanKillEnemy(RE_GERUDO_WARRIOR)),

24
soh/soh/Enhancements/randomizer/logic.cpp
View file

@ -1220,17 +1220,17 @@ namespace Rando {
switch (ctx->GetOption(RSK_GERUDO_FORTRESS).Get()) { switch (ctx->GetOption(RSK_GERUDO_FORTRESS).Get()) {
case RO_GF_CARPENTERS_NORMAL: case RO_GF_CARPENTERS_NORMAL:
return SmallKeys(RR_GF_GROUND_BOTTOM, 4) && return SmallKeys(RR_GF_GROUND_BOTTOM, 4) &&
TH_RescuedF1NorthCarpenter && TH_CouldRescueF1NorthCarpenter &&
TH_RescuedF1SouthCarpenter && TH_CouldRescueF1SouthCarpenter &&
TH_RescuedF2NorthCarpenter && TH_CouldRescueF2NorthCarpenter &&
TH_RescuedF2SouthCarpenter; TH_CouldRescueF2SouthCarpenter;
case RO_GF_CARPENTERS_FAST: case RO_GF_CARPENTERS_FAST:
return SmallKeys(RR_GF_GROUND_BOTTOM, 1) && return SmallKeys(RR_GF_GROUND_BOTTOM, 1) &&
( (
TH_RescuedF1NorthCarpenter || TH_CouldRescueF1NorthCarpenter ||
TH_RescuedF1SouthCarpenter || TH_CouldRescueF1SouthCarpenter ||
TH_RescuedF2NorthCarpenter || TH_CouldRescueF2NorthCarpenter ||
TH_RescuedF2SouthCarpenter TH_CouldRescueF2SouthCarpenter
); );
case RO_GF_CARPENTERS_FREE: case RO_GF_CARPENTERS_FREE:
return true; return true;
@ -2302,10 +2302,10 @@ namespace Rando {
//Events //Events
ShowedMidoSwordAndShield = false; ShowedMidoSwordAndShield = false;
TH_RescuedF1NorthCarpenter = false; TH_CouldRescueF1NorthCarpenter = false;
TH_RescuedF1SouthCarpenter = false; TH_CouldRescueF1SouthCarpenter = false;
TH_RescuedF2NorthCarpenter = false; TH_CouldRescueF2NorthCarpenter = false;
TH_RescuedF2SouthCarpenter = false; TH_CouldRescueF2SouthCarpenter = false;
GF_GateOpen = false; GF_GateOpen = false;
GtG_GateOpen = false; GtG_GateOpen = false;
DampesWindmillAccess = false; DampesWindmillAccess = false;

8
soh/soh/Enhancements/randomizer/logic.h
View file

@ -112,10 +112,10 @@ class Logic {
// Events // Events
bool ShowedMidoSwordAndShield = false; bool ShowedMidoSwordAndShield = false;
bool TH_RescuedF1NorthCarpenter = false; bool TH_CouldRescueF1NorthCarpenter = false;
bool TH_RescuedF1SouthCarpenter = false; bool TH_CouldRescueF1SouthCarpenter = false;
bool TH_RescuedF2NorthCarpenter = false; bool TH_CouldRescueF2NorthCarpenter = false;
bool TH_RescuedF2SouthCarpenter = false; bool TH_CouldRescueF2SouthCarpenter = false;
bool GF_GateOpen = false; bool GF_GateOpen = false;
bool GtG_GateOpen = false; bool GtG_GateOpen = false;
bool DampesWindmillAccess = false; bool DampesWindmillAccess = false;