Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions include/dusk/settings.h
Original file line number Diff line number Diff line change
Expand Up @@ -234,6 +234,7 @@ struct UserSettings {
ConfigVar<bool> fastSpinner;
ConfigVar<bool> freeMagicArmor;
ConfigVar<bool> invincibleEnemies;
ConfigVar<bool> invincibleLink;

// Technical
ConfigVar<bool> restoreWiiGlitches;
Expand Down
13 changes: 12 additions & 1 deletion src/d/actor/d_a_alink_damage.inc
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,12 @@ int daAlink_c::setDamagePoint(int i_dmgAmount, BOOL i_checkZoraMag, BOOL i_setDm
if (!mpHIO->mDamage.m.mInvincible && g_debugHpMode == 0)
#endif
{
dComIfGp_setItemLifeCount(-i_dmgAmount, 0);
#if TARGET_PC
if (!dusk::getSettings().game.invincibleLink)
#endif
{
dComIfGp_setItemLifeCount(-i_dmgAmount, 0);
}
}

#if TARGET_PC
Expand Down Expand Up @@ -490,6 +495,12 @@ BOOL daAlink_c::checkDamageAction() {
return 0;
}

#if TARGET_PC
if (dusk::getSettings().game.invincibleLink) {
return checkWolfBarrierHitReverse();
}
#endif

if (mDamageTimer != 0) {
return checkWolfBarrierHitReverse();
}
Expand Down
2 changes: 2 additions & 0 deletions src/dusk/settings.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,7 @@ UserSettings g_userSettings = {
.fastSpinner {"game.fastSpinner", false},
.freeMagicArmor {"game.freeMagicArmor", false},
.invincibleEnemies {"game.invincibleEnemies", false},
.invincibleLink {"game.invincibleLink", false},

// Technical
.restoreWiiGlitches {"game.restoreWiiGlitches", false},
Expand Down Expand Up @@ -284,6 +285,7 @@ void registerSettings() {
Register(g_userSettings.game.superClawshot);
Register(g_userSettings.game.alwaysGreatspin);
Register(g_userSettings.game.invincibleEnemies);
Register(g_userSettings.game.invincibleLink);
Register(g_userSettings.game.enableFrameInterpolation);
Register(g_userSettings.game.enableGyroAim);
Register(g_userSettings.game.enableGyroRollgoal);
Expand Down
3 changes: 3 additions & 0 deletions src/dusk/ui/settings.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,7 @@ void reset_for_speedrun_mode() {
getSettings().game.fastSpinner.setSpeedrunValue(false);
getSettings().game.freeMagicArmor.setSpeedrunValue(false);
getSettings().game.invincibleEnemies.setSpeedrunValue(false);
getSettings().game.invincibleLink.setSpeedrunValue(false);

getSettings().game.pauseOnFocusLost.setSpeedrunValue(false);
aurora_set_pause_on_focus_lost(false);
Expand Down Expand Up @@ -1269,6 +1270,8 @@ SettingsWindow::SettingsWindow(bool prelaunch) : mPrelaunch(prelaunch) {
"Lets the magic armor work without consuming rupees.");
addCheat("Invincible Enemies", getSettings().game.invincibleEnemies,
"Prevents enemies from taking damage.");
addCheat("Invincible Link", getSettings().game.invincibleLink,
"Makes Link ignore all incoming damage.");
});

add_tab("Interface", [this](Rml::Element* content) {
Expand Down
Loading