Skip to content

Commit 3222f33

Browse files
committed
feat: Player:[Get/Set]ImExcitedSpeedupCountdown
1 parent e70e341 commit 3222f33

File tree

3 files changed

+20
-1
lines changed

3 files changed

+20
-1
lines changed

changelog.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,12 @@ Added:
44
- MC_PRE_ROOM_COLLISION_PASS()
55
Triggers right before collision detection.
66
* Added EntitySaveStateManager class to support persistent, modded save data for entities.
7-
* EntityLaser
7+
* EntityLaser:
88
- SetInitSound(SoundEffect sound)
99
- Get/SetNumChainedLasers
1010
This is used by the Monstro's Lung + Technology synergy
11+
* EntityPlayer:
12+
- [Get/Set]ImExcitedSpeedupCountdown
1113
* Backported new enums for GameStateFlag
1214
/newline/
1315
Modified:

libzhl/functions/EntityPlayer.zhl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -764,6 +764,7 @@ struct Entity_Player depends (Vector, ANM2, ColorMod, KColor, PlayerCostumeMap,
764764
uint32_t _deadEyeCharges : 0x189c;
765765
uint32_t _deadEyeMisses : 0x18a0;
766766
uint32_t _mawOfTheVoidChargeTimer : 0x18a8;
767+
uint32_t _imExcitedSpeedupCountdown : 0x18d4;
767768
int _megaBlastDuration : 0x18e0;
768769
int _peeBurstCooldown : 0x18e4;
769770
int _maxPeeBurstCooldown : 0x18e8;

repentogon/LuaInterfaces/Entities/LuaEntityPlayer.cpp

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3266,6 +3266,20 @@ LUA_FUNCTION(Lua_PlayerSetItemStateCooldown) {
32663266
return 0;
32673267
}
32683268

3269+
LUA_FUNCTION(Lua_PlayerGetImExcitedSpeedupCountdown) {
3270+
Entity_Player* player = lua::GetLuabridgeUserdata<Entity_Player*>(L, 1, lua::Metatables::ENTITY_PLAYER, "EntityPlayer");
3271+
lua_pushinteger(L, player->_imExcitedSpeedupCountdown);
3272+
3273+
return 1;
3274+
}
3275+
3276+
LUA_FUNCTION(Lua_PlayerSetImExcitedSpeedupCountdown) {
3277+
Entity_Player* player = lua::GetLuabridgeUserdata<Entity_Player*>(L, 1, lua::Metatables::ENTITY_PLAYER, "EntityPlayer");
3278+
player->_imExcitedSpeedupCountdown = (unsigned int)luaL_checkinteger(L, 2);
3279+
3280+
return 0;
3281+
}
3282+
32693283
HOOK_METHOD(LuaEngine, RegisterClasses, () -> void) {
32703284
super();
32713285

@@ -3561,6 +3575,8 @@ HOOK_METHOD(LuaEngine, RegisterClasses, () -> void) {
35613575
{ "SetBlinkLockTime", Lua_PlayerSetBlinkLockTime },
35623576
{ "GetItemStateCooldown", Lua_PlayerGetItemStateCooldown },
35633577
{ "SetItemStateCooldown", Lua_PlayerSetItemStateCooldown },
3578+
{ "GetImExcitedSpeedupCountdown", Lua_PlayerGetImExcitedSpeedupCountdown },
3579+
{ "SetImExcitedSpeedupCountdown", Lua_PlayerSetImExcitedSpeedupCountdown },
35643580

35653581
{ NULL, NULL }
35663582
};

0 commit comments

Comments
 (0)