mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Initial API for reading guest animation status

This commit is contained in:
Aaron van Geffen 2024-04-27 21:42:11 +02:00
parent bf74dfba7b
commit 480c23005a
2 changed files with 84 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
src/openrct2/scripting/bindings/entity/ScGuest.cpp
View File

@ -13,6 +13,7 @@
# include "../../../entity/Guest.h"
# include "../../../localisation/Localisation.h"
# include "../../../peep/PeepAnimationData.h"
namespace OpenRCT2::Scripting
{
@ -144,6 +145,35 @@ namespace OpenRCT2::Scripting
{ "here_we_are", PeepThoughtType::HereWeAre },
});
static const DukEnumMap<PeepActionSpriteType> availableGuestAnimations({
{ "walking", PeepActionSpriteType::None },
{ "checkTime", PeepActionSpriteType::CheckTime },
{ "watchRide", PeepActionSpriteType::WatchRide },
{ "eatFood", PeepActionSpriteType::EatFood },
{ "shakeHead", PeepActionSpriteType::ShakeHead },
{ "emptyPockets", PeepActionSpriteType::EmptyPockets },
{ "holdMat", PeepActionSpriteType::HoldMat },
{ "sittingIdle", PeepActionSpriteType::SittingIdle },
{ "sittingEatFood", PeepActionSpriteType::SittingEatFood },
{ "sittingLookAroundLeft", PeepActionSpriteType::SittingLookAroundLeft },
{ "sittingLookAroundRight", PeepActionSpriteType::SittingLookAroundRight },
{ "hanging", PeepActionSpriteType::Ui },
{ "wow", PeepActionSpriteType::Wow },
{ "throwUp", PeepActionSpriteType::ThrowUp },
{ "jump", PeepActionSpriteType::Jump },
{ "drowning", PeepActionSpriteType::Drowning },
{ "joy", PeepActionSpriteType::Joy },
{ "readMap", PeepActionSpriteType::ReadMap },
{ "wave", PeepActionSpriteType::Wave },
{ "wave2", PeepActionSpriteType::Wave2 },
{ "takePhoto", PeepActionSpriteType::TakePhoto },
{ "clap", PeepActionSpriteType::Clap },
{ "disgust", PeepActionSpriteType::Disgust },
{ "drawPicture", PeepActionSpriteType::DrawPicture },
{ "beingWatched", PeepActionSpriteType::BeingWatched },
{ "withdrawMoney", PeepActionSpriteType::WithdrawMoney },
});
ScGuest::ScGuest(EntityId id)
: ScPeep(id)
{
@ -174,6 +204,10 @@ namespace OpenRCT2::Scripting
dukglue_register_property(ctx, &ScGuest::lostCountdown_get, &ScGuest::lostCountdown_set, "lostCountdown");
dukglue_register_property(ctx, &ScGuest::thoughts_get, nullptr, "thoughts");
dukglue_register_property(ctx, &ScGuest::items_get, nullptr, "items");
dukglue_register_property(ctx, &ScGuest::availableAnimations_get, nullptr, "availableAnimations");
dukglue_register_property(ctx, &ScGuest::animation_get, nullptr, "animation");
dukglue_register_property(ctx, &ScGuest::animationOffset_get, nullptr, "animationOffset");
dukglue_register_property(ctx, &ScGuest::animationLength_get, nullptr, "animationLength");
dukglue_register_method(ctx, &ScGuest::has_item, "hasItem");
dukglue_register_method(ctx, &ScGuest::give_item, "giveItem");
dukglue_register_method(ctx, &ScGuest::remove_item, "removeItem");
@ -791,6 +825,51 @@ namespace OpenRCT2::Scripting
}
}
std::vector<std::string> ScGuest::availableAnimations_get() const
{
std::vector<std::string> availableAnimations{};
for (auto& animation : availableGuestAnimations)
{
availableAnimations.push_back(std::string(animation.first));
}
return availableAnimations;
}
std::string ScGuest::animation_get() const
{
auto* peep = GetGuest();
if (peep == nullptr)
{
return nullptr;
}
std::string_view action = availableGuestAnimations[peep->ActionSpriteType];
return std::string(action);
}
uint8_t ScGuest::animationOffset_get() const
{
auto* peep = GetGuest();
if (peep == nullptr)
{
return 0;
}
return peep->ActionSpriteImageOffset;
}
uint8_t ScGuest::animationLength_get() const
{
auto* peep = GetGuest();
if (peep == nullptr)
{
return 0;
}
auto& animationGroup = GetPeepAnimation(peep->SpriteType, peep->ActionSpriteType);
return animationGroup.frame_offsets.size();
}
ScThought::ScThought(PeepThought backing)
: _backing(backing)
{

5
src/openrct2/scripting/bindings/entity/ScGuest.hpp
View File

@ -172,6 +172,11 @@ namespace OpenRCT2::Scripting
void give_item(const DukValue& item) const;
void remove_item(const DukValue& item) const;
void remove_all_items() const;
std::vector<std::string> availableAnimations_get() const;
std::string animation_get() const;
uint8_t animationOffset_get() const;
uint8_t animationLength_get() const;
};
} // namespace OpenRCT2::Scripting