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

[Enhancement] Include minigame ammo in infinite ammo cheat (#1973)

Browse source
This commit is contained in:
DeusVexus 2022-11-22 00:18:23 -08:00 • committed by GitHub
parent c569a46933
commit 1ae4e2c1f7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

12
soh/src/overlays/actors/ovl_player_actor/z_player.c
View file

@ -1874,7 +1874,9 @@ void func_808337D4(PlayState* play, Player* this) {
this->actor.shape.rot.y, 0, 0); this->actor.shape.rot.y, 0, 0);
if (spawnedActor != NULL) { if (spawnedActor != NULL) {
if ((explosiveType != 0) && (play->bombchuBowlingStatus != 0)) { if ((explosiveType != 0) && (play->bombchuBowlingStatus != 0)) {
play->bombchuBowlingStatus--; if (!CVar_GetS32("gInfiniteAmmo", 0)) {
play->bombchuBowlingStatus--;
}
if (play->bombchuBowlingStatus == 0) { if (play->bombchuBowlingStatus == 0) {
play->bombchuBowlingStatus = -1; play->bombchuBowlingStatus = -1;
} }
@ -2515,9 +2517,13 @@ s32 func_808350A4(PlayState* play, Player* this) {
func_80834380(play, this, &item, &arrowType); func_80834380(play, this, &item, &arrowType);
if (gSaveContext.minigameState == 1) { if (gSaveContext.minigameState == 1) {
play->interfaceCtx.hbaAmmo--; if (!CVar_GetS32("gInfiniteAmmo", 0)) {
play->interfaceCtx.hbaAmmo--;
}
} else if (play->shootingGalleryStatus != 0) { } else if (play->shootingGalleryStatus != 0) {
play->shootingGalleryStatus--; if (!CVar_GetS32("gInfiniteAmmo", 0)) {
play->shootingGalleryStatus--;
}
} else { } else {
Inventory_ChangeAmmo(item, -1); Inventory_ChangeAmmo(item, -1);
} }