From a8c11109ad82177dc85485bc0bcbe90ce7d6871e Mon Sep 17 00:00:00 2001 From: MysterD Date: Thu, 2 Jun 2022 21:19:53 -0700 Subject: [PATCH] Unhardcode castle cannon grate star requirement --- autogen/lua_definitions/structs.lua | 1 + docs/lua/structs.md | 1 + src/game/hardcoded.c | 1 + src/game/hardcoded.h | 1 + src/pc/lua/smlua_cobject_autogen.c | 3 ++- 5 files changed, 6 insertions(+), 1 deletion(-) diff --git a/autogen/lua_definitions/structs.lua b/autogen/lua_definitions/structs.lua index 6f011663..ed8b97d2 100644 --- a/autogen/lua_definitions/structs.lua +++ b/autogen/lua_definitions/structs.lua @@ -174,6 +174,7 @@ --- @field public BowlingBallThiLargeSpeed number --- @field public BowlingBallThiSmallSpeed number --- @field public BowlingBallTtmSpeed number +--- @field public GrateStarRequirement integer --- @field public KingBobombFVel number --- @field public KingBobombHealth integer --- @field public KingBobombYawVel integer diff --git a/docs/lua/structs.md b/docs/lua/structs.md index dc2cb70a..80e21b0f 100644 --- a/docs/lua/structs.md +++ b/docs/lua/structs.md @@ -293,6 +293,7 @@ | BowlingBallThiLargeSpeed | `number` | | | BowlingBallThiSmallSpeed | `number` | | | BowlingBallTtmSpeed | `number` | | +| GrateStarRequirement | `integer` | | | KingBobombFVel | `number` | | | KingBobombHealth | `integer` | | | KingBobombYawVel | `integer` | | diff --git a/src/game/hardcoded.c b/src/game/hardcoded.c index d919b2e5..c57069a6 100644 --- a/src/game/hardcoded.c +++ b/src/game/hardcoded.c @@ -117,6 +117,7 @@ struct BehaviorValues gDefaultBehaviorValues = { .BowlingBallTtmSpeed = 20.0f, .BowlingBallThiLargeSpeed = 25.0f, .BowlingBallThiSmallSpeed = 10.0f, + .GrateStarRequirement = 120, .ShowStarMilestones = TRUE, .starsNeededForDialog = { 1, 3, 8, 30, 50, 70 }, .dialogs = { diff --git a/src/game/hardcoded.h b/src/game/hardcoded.h index c42e3c9b..75f3d543 100644 --- a/src/game/hardcoded.h +++ b/src/game/hardcoded.h @@ -212,6 +212,7 @@ struct BehaviorValues { f32 BowlingBallTtmSpeed; f32 BowlingBallThiLargeSpeed; f32 BowlingBallThiSmallSpeed; + u16 GrateStarRequirement; u8 ShowStarMilestones; struct StarsNeededForDialog starsNeededForDialog; struct BehaviorDialogs dialogs; diff --git a/src/pc/lua/smlua_cobject_autogen.c b/src/pc/lua/smlua_cobject_autogen.c index e32e6136..d157d70e 100644 --- a/src/pc/lua/smlua_cobject_autogen.c +++ b/src/pc/lua/smlua_cobject_autogen.c @@ -207,13 +207,14 @@ static struct LuaObjectField sBehaviorTrajectoriesFields[LUA_BEHAVIOR_TRAJECTORI { "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] = { { "BowlingBallBob2Speed", LVT_F32, offsetof(struct BehaviorValues, BowlingBallBob2Speed), false, LOT_NONE }, { "BowlingBallBobSpeed", LVT_F32, offsetof(struct BehaviorValues, BowlingBallBobSpeed), false, LOT_NONE }, { "BowlingBallThiLargeSpeed", LVT_F32, offsetof(struct BehaviorValues, BowlingBallThiLargeSpeed), false, LOT_NONE }, { "BowlingBallThiSmallSpeed", LVT_F32, offsetof(struct BehaviorValues, BowlingBallThiSmallSpeed), 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 }, { "KingBobombHealth", LVT_S16, offsetof(struct BehaviorValues, KingBobombHealth), false, LOT_NONE }, { "KingBobombYawVel", LVT_S16, offsetof(struct BehaviorValues, KingBobombYawVel), false, LOT_NONE },