mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-02-16 15:20:11 -05:00
Code Issues Projects Releases Wiki Activity

[Cheat] No ReDead/Gibdo freeze (#2643)

Browse Source 
* No freeze

* Simplified

* removed random spaces

* Removed unnecessary parenthesis
This commit is contained in:
Patrick12115 2023-04-02 05:13:34 -04:00 committed by GitHub
parent f6ce7e6492
commit fb8dacbc69
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
soh/soh/GameMenuBar.cpp
View File

@ -1004,6 +1004,8 @@ namespace GameMenuBar {
UIWidgets::Tooltip("This allows you to put up your shield with any two-handed weapon in hand except for Deku Sticks"); UIWidgets::Tooltip("This allows you to put up your shield with any two-handed weapon in hand except for Deku Sticks");
UIWidgets::PaddedEnhancementCheckbox("Time Sync", "gTimeSync", true, false); UIWidgets::PaddedEnhancementCheckbox("Time Sync", "gTimeSync", true, false);
UIWidgets::Tooltip("This syncs the ingame time with the real world time"); UIWidgets::Tooltip("This syncs the ingame time with the real world time");
UIWidgets::PaddedEnhancementCheckbox("No ReDead/Gibdo Freeze", "gNoRedeadFreeze", true, false);
UIWidgets::Tooltip("Prevents ReDeads and Gibdos from being able to freeze you with their scream");
{ {
static int32_t betaQuestEnabled = CVarGetInteger("gEnableBetaQuest", 0); static int32_t betaQuestEnabled = CVarGetInteger("gEnableBetaQuest", 0);

4
soh/src/overlays/actors/ovl_En_Rd/z_en_rd.c
View File

@ -332,7 +332,7 @@ void func_80AE2C1C(EnRd* this, PlayState* play) {
if ((ABS(sp32) < 0x1554) && (Actor_WorldDistXYZToActor(&this->actor, &player->actor) <= 150.0f)) { if ((ABS(sp32) < 0x1554) && (Actor_WorldDistXYZToActor(&this->actor, &player->actor) <= 150.0f)) {
if (!(player->stateFlags1 & 0x2C6080) && !(player->stateFlags2 & 0x80)) { if (!(player->stateFlags1 & 0x2C6080) && !(player->stateFlags2 & 0x80)) {
if (this->unk_306 == 0) { if (this->unk_306 == 0) {
if (!(this->unk_312 & 0x80)) { if (!(this->unk_312 & 0x80) && !CVarGetInteger("gNoRedeadFreeze", 0)) {
player->actor.freezeTimer = 40; player->actor.freezeTimer = 40;
func_8008EEAC(play, &this->actor); func_8008EEAC(play, &this->actor);
GET_PLAYER(play)->unk_684 = &this->actor; GET_PLAYER(play)->unk_684 = &this->actor;
@ -561,7 +561,7 @@ void func_80AE3834(EnRd* this, PlayState* play) {
s16 temp_v0 = this->actor.yawTowardsPlayer - this->actor.shape.rot.y - this->unk_30E - this->unk_310; s16 temp_v0 = this->actor.yawTowardsPlayer - this->actor.shape.rot.y - this->unk_30E - this->unk_310;
if (ABS(temp_v0) < 0x2008) { if (ABS(temp_v0) < 0x2008) {
if (!(this->unk_312 & 0x80)) { if (!(this->unk_312 & 0x80) && !CVarGetInteger("gNoRedeadFreeze", 0)) {
player->actor.freezeTimer = 60; player->actor.freezeTimer = 60;
func_800AA000(this->actor.xzDistToPlayer, 0xFF, 0x14, 0x96); func_800AA000(this->actor.xzDistToPlayer, 0xFF, 0x14, 0x96);
func_8008EEAC(play, &this->actor); func_8008EEAC(play, &this->actor);