thirdpartymirrors/sm64coopdx
1
0
Fork 0
mirror of https://github.com/coop-deluxe/sm64coopdx.git synced 2025-10-30 08:01:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Unhardcode castle cannon grate star requirement

Browse source
This commit is contained in:
MysterD 2022-06-02 21:19:53 -07:00
parent c0cfc89236
commit a8c11109ad
5 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
autogen/lua_definitions/structs.lua
View file

@ -174,6 +174,7 @@
--- @field public BowlingBallThiLargeSpeed number --- @field public BowlingBallThiLargeSpeed number
--- @field public BowlingBallThiSmallSpeed number --- @field public BowlingBallThiSmallSpeed number
--- @field public BowlingBallTtmSpeed number --- @field public BowlingBallTtmSpeed number
--- @field public GrateStarRequirement integer
--- @field public KingBobombFVel number --- @field public KingBobombFVel number
--- @field public KingBobombHealth integer --- @field public KingBobombHealth integer
--- @field public KingBobombYawVel integer --- @field public KingBobombYawVel integer

1
docs/lua/structs.md
View file

@ -293,6 +293,7 @@
| BowlingBallThiLargeSpeed | `number` | | | BowlingBallThiLargeSpeed | `number` | |
| BowlingBallThiSmallSpeed | `number` | | | BowlingBallThiSmallSpeed | `number` | |
| BowlingBallTtmSpeed | `number` | | | BowlingBallTtmSpeed | `number` | |
| GrateStarRequirement | `integer` | |
| KingBobombFVel | `number` | | | KingBobombFVel | `number` | |
| KingBobombHealth | `integer` | | | KingBobombHealth | `integer` | |
| KingBobombYawVel | `integer` | | | KingBobombYawVel | `integer` | |

1
src/game/hardcoded.c
View file

@ -117,6 +117,7 @@ struct BehaviorValues gDefaultBehaviorValues = {
.BowlingBallTtmSpeed = 20.0f, .BowlingBallTtmSpeed = 20.0f,
.BowlingBallThiLargeSpeed = 25.0f, .BowlingBallThiLargeSpeed = 25.0f,
.BowlingBallThiSmallSpeed = 10.0f, .BowlingBallThiSmallSpeed = 10.0f,
.GrateStarRequirement = 120,
.ShowStarMilestones = TRUE, .ShowStarMilestones = TRUE,
.starsNeededForDialog = { 1, 3, 8, 30, 50, 70 }, .starsNeededForDialog = { 1, 3, 8, 30, 50, 70 },
.dialogs = { .dialogs = {

1
src/game/hardcoded.h
View file

@ -212,6 +212,7 @@ struct BehaviorValues {
f32 BowlingBallTtmSpeed; f32 BowlingBallTtmSpeed;
f32 BowlingBallThiLargeSpeed; f32 BowlingBallThiLargeSpeed;
f32 BowlingBallThiSmallSpeed; f32 BowlingBallThiSmallSpeed;
u16 GrateStarRequirement;
u8 ShowStarMilestones; u8 ShowStarMilestones;
struct StarsNeededForDialog starsNeededForDialog; struct StarsNeededForDialog starsNeededForDialog;
struct BehaviorDialogs dialogs; struct BehaviorDialogs dialogs;

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

@ -207,13 +207,14 @@ static struct LuaObjectField sBehaviorTrajectoriesFields[LUA_BEHAVIOR_TRAJECTORI
{ "UnagiTrajectory", LVT_TRAJECTORY_P, offsetof(struct BehaviorTrajectories, UnagiTrajectory), false, LOT_POINTER }, { "UnagiTrajectory", LVT_TRAJECTORY_P, offsetof(struct BehaviorTrajectories, UnagiTrajectory), false, LOT_POINTER },
}; };
#define LUA_BEHAVIOR_VALUES_FIELD_COUNT 25 #define LUA_BEHAVIOR_VALUES_FIELD_COUNT 26
static struct LuaObjectField sBehaviorValuesFields[LUA_BEHAVIOR_VALUES_FIELD_COUNT] = { static struct LuaObjectField sBehaviorValuesFields[LUA_BEHAVIOR_VALUES_FIELD_COUNT] = {
{ "BowlingBallBob2Speed", LVT_F32, offsetof(struct BehaviorValues, BowlingBallBob2Speed), false, LOT_NONE }, { "BowlingBallBob2Speed", LVT_F32, offsetof(struct BehaviorValues, BowlingBallBob2Speed), false, LOT_NONE },
{ "BowlingBallBobSpeed", LVT_F32, offsetof(struct BehaviorValues, BowlingBallBobSpeed), false, LOT_NONE }, { "BowlingBallBobSpeed", LVT_F32, offsetof(struct BehaviorValues, BowlingBallBobSpeed), false, LOT_NONE },
{ "BowlingBallThiLargeSpeed", LVT_F32, offsetof(struct BehaviorValues, BowlingBallThiLargeSpeed), false, LOT_NONE }, { "BowlingBallThiLargeSpeed", LVT_F32, offsetof(struct BehaviorValues, BowlingBallThiLargeSpeed), false, LOT_NONE },
{ "BowlingBallThiSmallSpeed", LVT_F32, offsetof(struct BehaviorValues, BowlingBallThiSmallSpeed), false, LOT_NONE }, { "BowlingBallThiSmallSpeed", LVT_F32, offsetof(struct BehaviorValues, BowlingBallThiSmallSpeed), false, LOT_NONE },
{ "BowlingBallTtmSpeed", LVT_F32, offsetof(struct BehaviorValues, BowlingBallTtmSpeed), false, LOT_NONE }, { "BowlingBallTtmSpeed", LVT_F32, offsetof(struct BehaviorValues, BowlingBallTtmSpeed), false, LOT_NONE },
{ "GrateStarRequirement", LVT_U16, offsetof(struct BehaviorValues, GrateStarRequirement), false, LOT_NONE },
{ "KingBobombFVel", LVT_F32, offsetof(struct BehaviorValues, KingBobombFVel), false, LOT_NONE }, { "KingBobombFVel", LVT_F32, offsetof(struct BehaviorValues, KingBobombFVel), false, LOT_NONE },
{ "KingBobombHealth", LVT_S16, offsetof(struct BehaviorValues, KingBobombHealth), false, LOT_NONE }, { "KingBobombHealth", LVT_S16, offsetof(struct BehaviorValues, KingBobombHealth), false, LOT_NONE },
{ "KingBobombYawVel", LVT_S16, offsetof(struct BehaviorValues, KingBobombYawVel), false, LOT_NONE }, { "KingBobombYawVel", LVT_S16, offsetof(struct BehaviorValues, KingBobombYawVel), false, LOT_NONE },