Skip to content

Commit 29a3c90

Browse files
committed
More Quests
1 parent f231d57 commit 29a3c90

5 files changed

Lines changed: 219 additions & 40 deletions

File tree

soh/soh/Enhancements/RogueLike/ActorBehavior/ActorBehavior.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ static void MiscVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, va_li
4040
case VB_GIVE_ITEM_FROM_ANJU_AS_ADULT: {
4141
EnNiwLady* enNiwLady = va_arg(args, EnNiwLady*);
4242
Flags_SetItemGetInf(ITEMGETINF_2C);
43-
RogueLike::Quests::AddQuestById(RL_QUEST_HF_STALFOS);
43+
RogueLike::Quests::AddQuestById(RL_QUEST_KV_STALFOS);
4444
enNiwLady->actionFunc = func_80ABA778;
4545
*should = false;
4646
break;

soh/soh/Enhancements/RogueLike/ActorBehavior/Enemies.cpp

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,12 @@ static void InitEnemyBehavior() {
3636

3737
COND_HOOK(OnActorUpdate, IS_ROGUELIKE, [](void* actor) {
3838
Actor* refActor = static_cast<Actor*>(actor);
39-
if (refActor->category != ACTORCAT_ENEMY) {
39+
if (refActor->category != ACTORCAT_ENEMY && refActor->id != ACTOR_OBJ_TSUBO) {
40+
return;
41+
}
42+
43+
if (refActor->id == ACTOR_OBJ_TSUBO && refActor->params == 256) {
44+
Actor_SetColorFilter(refActor, 0x1000, 150, 0, 1000);
4045
return;
4146
}
4247

soh/soh/Enhancements/RogueLike/GUI/GUI.cpp

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -332,20 +332,24 @@ static void InitRogueLikeGUI() {
332332
SohGui::mSohMenu->AddSidebarEntry("RogueLike", "Configuration", 1);
333333
WidgetPath path = { "RogueLike", "Configuration", SECTION_COLUMN_1 };
334334
SohGui::mSohMenu->AddWidget(path, "Configuration", WIDGET_CUSTOM).CustomFunction([](WidgetInfo& info) {
335-
336335
if (UIWidgets::Button("Add XP Level", UIWidgets::ButtonOptions().Size(UIWidgets::Sizes::Inline))) {
337-
RogueLike::XP::GrantXP(RogueLike::XP::ConvertLevelToXP(RogueLike::XP::GetCurrentLevel() + 1) - gSaveContext.ship.quest.data.rogueLike.xp + 1);
336+
RogueLike::XP::GrantXP(RogueLike::XP::ConvertLevelToXP(RogueLike::XP::GetCurrentLevel() + 1) -
337+
gSaveContext.ship.quest.data.rogueLike.xp + 1);
338338
}
339339
ImGui::SameLine();
340340
if (UIWidgets::Button("Remove XP Level", UIWidgets::ButtonOptions().Size(UIWidgets::Sizes::Inline))) {
341-
gSaveContext.ship.quest.data.rogueLike.xp = RogueLike::XP::ConvertLevelToXP(RogueLike::XP::GetCurrentLevel() - 1);
341+
gSaveContext.ship.quest.data.rogueLike.xp =
342+
RogueLike::XP::ConvertLevelToXP(RogueLike::XP::GetCurrentLevel() - 1);
342343
}
343344
if (UIWidgets::Button("Add Difficulty Level", UIWidgets::ButtonOptions().Size(UIWidgets::Sizes::Inline))) {
344-
RogueLike::Difficulty::IncrementDifficulty(RogueLike::Difficulty::ConvertLevelToDifficulty(RogueLike::Difficulty::GetCurrentLevel() + 1) - gSaveContext.ship.quest.data.rogueLike.difficulty + 1);
345+
RogueLike::Difficulty::IncrementDifficulty(
346+
RogueLike::Difficulty::ConvertLevelToDifficulty(RogueLike::Difficulty::GetCurrentLevel() + 1) -
347+
gSaveContext.ship.quest.data.rogueLike.difficulty + 1);
345348
}
346349
ImGui::SameLine();
347350
if (UIWidgets::Button("Remove Difficulty Level", UIWidgets::ButtonOptions().Size(UIWidgets::Sizes::Inline))) {
348-
gSaveContext.ship.quest.data.rogueLike.difficulty = RogueLike::Difficulty::ConvertLevelToDifficulty(RogueLike::Difficulty::GetCurrentLevel() - 1);
351+
gSaveContext.ship.quest.data.rogueLike.difficulty =
352+
RogueLike::Difficulty::ConvertLevelToDifficulty(RogueLike::Difficulty::GetCurrentLevel() - 1);
349353
}
350354

351355
if (UIWidgets::Button("Reset All", UIWidgets::ButtonOptions().Size(UIWidgets::Sizes::Inline))) {

0 commit comments

Comments
 (0)