etc/sm64coopdx
0
0
Fork 0
mirror of https://github.com/coop-deluxe/sm64coopdx.git synced 2024-11-21 19:45:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add gLevelValues.bubbleOnDeathBarrierInCapStages (#449)

Browse source 
Also add a few smaller fixes with bubbles
This commit is contained in:
Sunk 2023-07-18 18:01:05 -04:00 committed by GitHub
parent 3242c4e7c8
commit d1aa4aee1e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
autogen/lua_definitions/structs.lua
View file

@ -642,6 +642,7 @@
--- @field public yaw integer
--- @class LevelValues
--- @field public bubbleOnDeathBarrierInCapStages boolean
--- @field public cellHeightLimit integer
--- @field public coinsRequiredForCoinStar integer
--- @field public disableActs boolean

1
docs/lua/structs.md
View file

@ -948,6 +948,7 @@
| Field | Type | Access |
| ----- | ---- | ------ |
| bubbleOnDeathBarrierInCapStages | `boolean` | |
| cellHeightLimit | `integer` | |
| coinsRequiredForCoinStar | `integer` | |
| disableActs | `boolean` | |

3
src/game/hardcoded.c
View file

@ -117,7 +117,8 @@ struct LevelValues gDefaultLevelValues = {
.wingCapLookUpReq = 10,
.maxLives = 100,
.maxCoins = 999,
.numCoinsToLife = 50
.numCoinsToLife = 50,
.bubbleOnDeathBarrierInCapStages = false
};
struct LevelValues gLevelValues = { 0 };

1
src/game/hardcoded.h
View file

@ -85,6 +85,7 @@ struct LevelValues {
u16 maxLives;
u16 maxCoins;
u16 numCoinsToLife;
bool bubbleOnDeathBarrierInCapStages;
};
extern struct LevelValues gLevelValues;

6
src/game/interaction.c
View file

@ -2372,8 +2372,10 @@ void check_death_barrier(struct MarioState *m) {
case COURSE_TOTWC: // (21) Tower of the Wing Cap
case COURSE_VCUTM: // (22) Vanish Cap Under the Moat
case COURSE_WMOTR: // (23) Winged Mario over the Rainbow
break;
default:
if (!gLevelValues.bubbleOnDeathBarrierInCapStages){
break;
}
default:
mario_set_bubbled(m);
return;
}

4
src/game/mario.c
View file

@ -446,8 +446,8 @@ void mario_set_bubbled(struct MarioState* m) {
gLocalBubbleCounter = 20;
set_mario_action(m, ACT_BUBBLED, 0);
if (m->numLives != -1) {
drop_and_set_mario_action(m, ACT_BUBBLED, 0);
if (m->numLives > -1) {
m->numLives--;
}
m->healCounter = 0;

3
src/pc/lua/smlua_cobject_autogen.c
View file

@ -743,8 +743,9 @@ static struct LuaObjectField sLakituStateFields[LUA_LAKITU_STATE_FIELD_COUNT] =
{ "yaw", LVT_S16, offsetof(struct LakituState, yaw), false, LOT_NONE },
};
#define LUA_LEVEL_VALUES_FIELD_COUNT 45
#define LUA_LEVEL_VALUES_FIELD_COUNT 46
static struct LuaObjectField sLevelValuesFields[LUA_LEVEL_VALUES_FIELD_COUNT] = {
{ "bubbleOnDeathBarrierInCapStages", LVT_BOOL, offsetof(struct LevelValues, bubbleOnDeathBarrierInCapStages), false, LOT_NONE },
{ "cellHeightLimit", LVT_S16, offsetof(struct LevelValues, cellHeightLimit), false, LOT_NONE },
{ "coinsRequiredForCoinStar", LVT_S16, offsetof(struct LevelValues, coinsRequiredForCoinStar), false, LOT_NONE },
{ "disableActs", LVT_BOOL, offsetof(struct LevelValues, disableActs), false, LOT_NONE },