mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-20 21:43:06 +01:00
Code Issues Releases Wiki Activity

Rename PeepAnimationType::None to PeepAnimationType::Walking (#23317)

Browse Source
This commit is contained in:
Aaron van Geffen
2024-12-04 17:09:17 +01:00
committed by GitHub
parent a55a690db3
commit f65ef67260
11 changed files with 164 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/openrct2-ui/windows/GameBottomToolbar.cpp
View File

@@ -300,7 +300,7 @@ namespace OpenRCT2::Ui::Windows
{
GfxDrawSprite(cliped_dpi, ImageId(image_id_base + 32, guest->BalloonColour), clipCoords);
}
if (image_id_base >= kPeepSpriteUmbrellaStateNoneId
if (image_id_base >= kPeepSpriteUmbrellaStateWalkingId
&& image_id_base < kPeepSpriteUmbrellaStateSittingIdleId + 4)
{
GfxDrawSprite(cliped_dpi, ImageId(image_id_base + 32, guest->UmbrellaColour), clipCoords);

2
src/openrct2-ui/windows/Guest.cpp
View File

@@ -580,7 +580,7 @@ namespace OpenRCT2::Ui::Windows
}
// If holding umbrella
if (animationFrame >= kPeepSpriteUmbrellaStateNoneId
if (animationFrame >= kPeepSpriteUmbrellaStateWalkingId
&& animationFrame < kPeepSpriteUmbrellaStateSittingIdleId + 4)
{
GfxDrawSprite(clipDpi, ImageId(animationFrame + 32, guest->UmbrellaColour), screenCoords);

2
src/openrct2/actions/StaffHireNewAction.cpp
View File

@@ -134,7 +134,7 @@ GameActions::Result StaffHireNewAction::QueryExecute(bool execute) const
newPeep->SpecialSprite = 0;
newPeep->AnimationImageIdOffset = 0;
newPeep->WalkingAnimationFrameNum = 0;
newPeep->AnimationType = PeepAnimationType::None;
newPeep->AnimationType = PeepAnimationType::Walking;
newPeep->PathCheckOptimisation = 0;
newPeep->PeepFlags = 0;
newPeep->StaffLawnsMown = 0;

2
src/openrct2/entity/Guest.cpp
View File

@@ -7145,7 +7145,7 @@ Guest* Guest::Generate(const CoordsXYZ& coords)
peep->SpecialSprite = 0;
peep->AnimationImageIdOffset = 0;
peep->WalkingAnimationFrameNum = 0;
peep->AnimationType = PeepAnimationType::None;
peep->AnimationType = PeepAnimationType::Walking;
peep->PeepFlags = 0;
peep->FavouriteRide = RideId::GetNull();
peep->FavouriteRideRating = 0;

10
src/openrct2/entity/Peep.cpp
View File

@@ -80,7 +80,7 @@ static std::shared_ptr<IAudioChannel> _crowdSoundChannel = nullptr;
static void GuestReleaseBalloon(Guest* peep, int16_t spawn_height);
static PeepAnimationType PeepSpecialSpriteToAnimationGroupMap[] = {
PeepAnimationType::None,
PeepAnimationType::Walking,
PeepAnimationType::HoldMat,
PeepAnimationType::StaffMower,
};
@@ -332,7 +332,7 @@ PeepAnimationType Peep::GetAnimationType()
Guard::Assert(
EnumValue(Action) >= std::size(PeepActionToAnimationGroupMap) && Action < PeepActionType::Idle,
"Invalid peep action %u", EnumValue(Action));
return PeepAnimationType::None;
return PeepAnimationType::Walking;
}
/*
@@ -625,7 +625,7 @@ void Peep::PickupAbort(int32_t old_x)
Action = PeepActionType::Walking;
SpecialSprite = 0;
AnimationImageIdOffset = 0;
AnimationType = PeepAnimationType::None;
AnimationType = PeepAnimationType::Walking;
PathCheckOptimisation = 0;
}
@@ -674,7 +674,7 @@ GameActions::Result Peep::Place(const TileCoordsXYZ& location, bool apply)
Action = PeepActionType::Walking;
SpecialSprite = 0;
AnimationImageIdOffset = 0;
AnimationType = PeepAnimationType::None;
AnimationType = PeepAnimationType::Walking;
PathCheckOptimisation = 0;
EntityTweener::Get().Reset();
auto* guest = As<Guest>();
@@ -2911,7 +2911,7 @@ void Peep::Paint(PaintSession& session, int32_t imageDirection) const
return;
}
if (baseImageId >= kPeepSpriteUmbrellaStateNoneId && baseImageId < (kPeepSpriteUmbrellaStateSittingIdleId + 4))
if (baseImageId >= kPeepSpriteUmbrellaStateWalkingId && baseImageId < (kPeepSpriteUmbrellaStateSittingIdleId + 4))
{
imageId = ImageId(baseImageId + 32, guest->UmbrellaColour);
PaintAddImageAsChild(session, imageId, offset, bb);

2
src/openrct2/entity/Peep.h
View File

@@ -153,7 +153,7 @@ enum class PeepActionType : uint8_t
enum class PeepAnimationType : uint8_t
{
None = 0,
Walking = 0,
CheckTime = 1,
WatchRide = 2,
EatFood = 3,

196
src/openrct2/peep/PeepAnimationData.cpp
View File

@@ -116,7 +116,7 @@ namespace OpenRCT2
// clang-format off
// Define animation sequences for Normal sprites
static constexpr std::array<uint8_t, 6> kPeepAnimationSequenceNormalNone = { 0, 1, 2, 3, 4, 5 };
static constexpr std::array<uint8_t, 6> kPeepAnimationSequenceNormalWalking = { 0, 1, 2, 3, 4, 5 };
static constexpr std::array<uint8_t, 16> kPeepAnimationSequenceNormalCheckTime = { 0, 1, 2, 3, 4, 5, 6, 6, 6, 6, 6, 6, 6, 6, 7, 8 };
static constexpr std::array<uint8_t, 1> kPeepAnimationSequenceNormalWatchRide = { 0 };
static constexpr std::array<uint8_t, 24> kPeepAnimationSequenceNormalEatFood = { 0, 1, 2, 3, 4, 5, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 7, 8, 9, 10 };
@@ -146,7 +146,7 @@ namespace OpenRCT2
// Define animation group for Normal sequences
static PeepAnimations kPeepAnimationsNormal = []() {
PeepAnimations pag;
pag[PeepAnimationType::None] = { kPeepSpriteNormalStateNoneId, kPeepAnimationSequenceNormalNone };
pag[PeepAnimationType::Walking] = { kPeepSpriteNormalStateWalkingId, kPeepAnimationSequenceNormalWalking };
pag[PeepAnimationType::CheckTime] = { kPeepSpriteNormalStateCheckTimeId, kPeepAnimationSequenceNormalCheckTime };
pag[PeepAnimationType::WatchRide] = { kPeepSpriteNormalStateWatchRideId, kPeepAnimationSequenceNormalWatchRide };
pag[PeepAnimationType::EatFood] = { kPeepSpriteNormalStateEatFoodId, kPeepAnimationSequenceNormalEatFood };
@@ -176,7 +176,7 @@ namespace OpenRCT2
}();
// Define animation sequences for Handyman sprites
static constexpr std::array<uint8_t, 6> kPeepAnimationSequenceHandymanNone = { 0, 1, 2, 3, 4, 5 };
static constexpr std::array<uint8_t, 6> kPeepAnimationSequenceHandymanWalking = { 0, 1, 2, 3, 4, 5 };
static constexpr std::array<uint8_t, 1> kPeepAnimationSequenceHandymanWatchRide = { 0 };
static constexpr std::array<uint8_t, 12> kPeepAnimationSequenceHandymanHanging = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 };
static constexpr std::array<uint8_t, 6> kPeepAnimationSequenceHandymanStaffMower = { 0, 1, 2, 3, 4, 5 };
@@ -188,7 +188,7 @@ namespace OpenRCT2
// Define animation group for Handyman sequences
static PeepAnimations kPeepAnimationsHandyman = []() {
PeepAnimations pag;
pag[PeepAnimationType::None] = { kHandymanSpriteStateNoneId, kPeepAnimationSequenceHandymanNone };
pag[PeepAnimationType::Walking] = { kHandymanSpriteStateWalkingId, kPeepAnimationSequenceHandymanWalking };
pag[PeepAnimationType::WatchRide] = { kHandymanSpriteStateWatchRideId, kPeepAnimationSequenceHandymanWatchRide };
pag[PeepAnimationType::Hanging] = { kHandymanSpriteStateHangingId, kPeepAnimationSequenceHandymanHanging };
pag[PeepAnimationType::StaffMower] = { kHandymanSpriteStateStaffMowerId, kPeepAnimationSequenceHandymanStaffMower };
@@ -200,7 +200,7 @@ namespace OpenRCT2
}();
// Define animation sequences for Mechanic sprites
static constexpr std::array<uint8_t, 6> kPeepAnimationSequenceMechanicNone = { 0, 1, 2, 3, 4, 5 };
static constexpr std::array<uint8_t, 6> kPeepAnimationSequenceMechanicWalking = { 0, 1, 2, 3, 4, 5 };
static constexpr std::array<uint8_t, 1> kPeepAnimationSequenceMechanicWatchRide = { 0 };
static constexpr std::array<uint8_t, 12> kPeepAnimationSequenceMechanicHanging = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 };
static constexpr std::array<uint8_t, 65> kPeepAnimationSequenceMechanicDrowning = { 0, 1, 2, 3, 2, 1, 0, 1, 2, 3, 2, 1, 0, 1, 2, 3, 2, 1, 0, 1, 2, 3, 2, 1, 0, 1, 2, 3, 2, 1, 0, 1, 2, 3, 2, 1, 0, 1, 2, 3, 2, 1, 0, 1, 2, 3, 2, 1, 0, 1, 2, 3, 2, 1, 0, 1, 2, 3, 2, 1, 0, 4, 5, 6, 7 };
@@ -215,7 +215,7 @@ namespace OpenRCT2
// Define animation group for Mechanic sequences
static PeepAnimations kPeepAnimationsMechanic = []() {
PeepAnimations pag;
pag[PeepAnimationType::None] = { kMechanicSpriteStateNoneId, kPeepAnimationSequenceMechanicNone };
pag[PeepAnimationType::Walking] = { kMechanicSpriteStateWalkingId, kPeepAnimationSequenceMechanicWalking };
pag[PeepAnimationType::WatchRide] = { kMechanicSpriteStateWatchRideId, kPeepAnimationSequenceMechanicWatchRide };
pag[PeepAnimationType::Hanging] = { kMechanicSpriteStateHangingId, kPeepAnimationSequenceMechanicHanging };
pag[PeepAnimationType::Drowning] = { kMechanicSpriteStateDrowningId, kPeepAnimationSequenceMechanicDrowning };
@@ -230,7 +230,7 @@ namespace OpenRCT2
}();
// Define animation sequences for Security sprites
static constexpr std::array<uint8_t, 6> kPeepAnimationSequenceSecurityNone = { 0, 1, 2, 3, 4, 5 };
static constexpr std::array<uint8_t, 6> kPeepAnimationSequenceSecurityWalking = { 0, 1, 2, 3, 4, 5 };
static constexpr std::array<uint8_t, 1> kPeepAnimationSequenceSecurityWatchRide = { 0 };
static constexpr std::array<uint8_t, 12> kPeepAnimationSequenceSecurityHanging = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 };
static constexpr std::array<uint8_t, 64> kPeepAnimationSequenceSecurityDrowning = { 0, 1, 2, 3, 2, 1, 0, 1, 2, 3, 2, 1, 0, 1, 2, 3, 2, 1, 0, 1, 2, 3, 2, 1, 0, 1, 2, 3, 2, 1, 0, 1, 2, 3, 2, 1, 0, 1, 2, 3, 2, 1, 0, 1, 2, 3, 2, 1, 0, 1, 2, 3, 2, 1, 0, 1, 2, 3, 2, 1, 0, 4, 5, 6 };
@@ -238,7 +238,7 @@ namespace OpenRCT2
// Define animation group for Security sequences
static PeepAnimations kPeepAnimationsSecurity = []() {
PeepAnimations pag;
pag[PeepAnimationType::None] = { kSecuritySpriteStateNoneId, kPeepAnimationSequenceSecurityNone };
pag[PeepAnimationType::Walking] = { kSecuritySpriteStateWalkingId, kPeepAnimationSequenceSecurityWalking };
pag[PeepAnimationType::WatchRide] = { kSecuritySpriteStateWatchRideId, kPeepAnimationSequenceSecurityWatchRide };
pag[PeepAnimationType::Hanging] = { kSecuritySpriteStateHangingId, kPeepAnimationSequenceSecurityHanging };
pag[PeepAnimationType::Drowning] = { kSecuritySpriteStateDrowningId, kPeepAnimationSequenceSecurityDrowning };
@@ -246,7 +246,7 @@ namespace OpenRCT2
}();
// Define animation sequences for EntertainerPanda sprites
static constexpr std::array<uint8_t, 6> kPeepAnimationSequenceEntertainerPandaNone = { 0, 1, 2, 3, 4, 5 };
static constexpr std::array<uint8_t, 6> kPeepAnimationSequenceEntertainerPandaWalking = { 0, 1, 2, 3, 4, 5 };
static constexpr std::array<uint8_t, 1> kPeepAnimationSequenceEntertainerPandaWatchRide = { 0 };
static constexpr std::array<uint8_t, 23> kPeepAnimationSequenceEntertainerPandaEatFood = { 0, 1, 2, 3, 4, 5, 4, 3, 4, 5, 4, 3, 4, 5, 4, 3, 4, 5, 4, 3, 2, 1, 0 };
static constexpr std::array<uint8_t, 12> kPeepAnimationSequenceEntertainerPandaHanging = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 };
@@ -257,7 +257,7 @@ namespace OpenRCT2
// Define animation group for EntertainerPanda sequences
static PeepAnimations kPeepAnimationsEntertainerPanda = []() {
PeepAnimations pag;
pag[PeepAnimationType::None] = { kEntertainerSpritePandaStateNoneId, kPeepAnimationSequenceEntertainerPandaNone };
pag[PeepAnimationType::Walking] = { kEntertainerSpritePandaStateWalkingId, kPeepAnimationSequenceEntertainerPandaWalking };
pag[PeepAnimationType::WatchRide] = { kEntertainerSpritePandaStateWatchRideId, kPeepAnimationSequenceEntertainerPandaWatchRide };
pag[PeepAnimationType::EatFood] = { kEntertainerSpritePandaStateWaveId, kPeepAnimationSequenceEntertainerPandaEatFood };
pag[PeepAnimationType::Hanging] = { kEntertainerSpritePandaStateHangingId, kPeepAnimationSequenceEntertainerPandaHanging };
@@ -268,7 +268,7 @@ namespace OpenRCT2
}();
// Define animation sequences for EntertainerTiger sprites
static constexpr std::array<uint8_t, 6> kPeepAnimationSequenceEntertainerTigerNone = { 0, 1, 2, 3, 4, 5 };
static constexpr std::array<uint8_t, 6> kPeepAnimationSequenceEntertainerTigerWalking = { 0, 1, 2, 3, 4, 5 };
static constexpr std::array<uint8_t, 1> kPeepAnimationSequenceEntertainerTigerWatchRide = { 0 };
static constexpr std::array<uint8_t, 23> kPeepAnimationSequenceEntertainerTigerEatFood = { 0, 1, 2, 3, 4, 5, 4, 3, 4, 5, 4, 3, 4, 5, 4, 3, 4, 5, 4, 3, 2, 1, 0 };
static constexpr std::array<uint8_t, 12> kPeepAnimationSequenceEntertainerTigerHanging = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 };
@@ -279,7 +279,7 @@ namespace OpenRCT2
// Define animation group for EntertainerTiger sequences
static PeepAnimations kPeepAnimationsEntertainerTiger = []() {
PeepAnimations pag;
pag[PeepAnimationType::None] = { kEntertainerSpriteTigerStateNoneId, kPeepAnimationSequenceEntertainerTigerNone };
pag[PeepAnimationType::Walking] = { kEntertainerSpriteTigerStateWalkingId, kPeepAnimationSequenceEntertainerTigerWalking };
pag[PeepAnimationType::WatchRide] = { kEntertainerSpriteTigerStateWatchRideId, kPeepAnimationSequenceEntertainerTigerWatchRide };
pag[PeepAnimationType::EatFood] = { kEntertainerSpriteTigerStateWaveId, kPeepAnimationSequenceEntertainerTigerEatFood };
pag[PeepAnimationType::Hanging] = { kEntertainerSpriteTigerStateHangingId, kPeepAnimationSequenceEntertainerTigerHanging };
@@ -290,7 +290,7 @@ namespace OpenRCT2
}();
// Define animation sequences for EntertainerElephant sprites
static constexpr std::array<uint8_t, 6> kPeepAnimationSequenceEntertainerElephantNone = { 0, 1, 2, 3, 4, 5 };
static constexpr std::array<uint8_t, 6> kPeepAnimationSequenceEntertainerElephantWalking = { 0, 1, 2, 3, 4, 5 };
static constexpr std::array<uint8_t, 1> kPeepAnimationSequenceEntertainerElephantWatchRide = { 0 };
static constexpr std::array<uint8_t, 25> kPeepAnimationSequenceEntertainerElephantEatFood = { 0, 1, 2, 3, 4, 5, 6, 5, 4, 3, 4, 5, 6, 5, 4, 3, 4, 5, 6, 5, 4, 3, 2, 1, 0 };
static constexpr std::array<uint8_t, 12> kPeepAnimationSequenceEntertainerElephantHanging = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 };
@@ -301,7 +301,7 @@ namespace OpenRCT2
// Define animation group for EntertainerElephant sequences
static PeepAnimations kPeepAnimationsEntertainerElephant = []() {
PeepAnimations pag;
pag[PeepAnimationType::None] = { kEntertainerSpriteElephantStateNoneId, kPeepAnimationSequenceEntertainerElephantNone };
pag[PeepAnimationType::Walking] = { kEntertainerSpriteElephantStateWalkingId, kPeepAnimationSequenceEntertainerElephantWalking };
pag[PeepAnimationType::WatchRide] = { kEntertainerSpriteElephantStateWatchRideId, kPeepAnimationSequenceEntertainerElephantWatchRide };
pag[PeepAnimationType::EatFood] = { kEntertainerSpriteElephantStateWaveId, kPeepAnimationSequenceEntertainerElephantEatFood };
pag[PeepAnimationType::Hanging] = { kEntertainerSpriteElephantStateHangingId, kPeepAnimationSequenceEntertainerElephantHanging };
@@ -312,7 +312,7 @@ namespace OpenRCT2
}();
// Define animation sequences for EntertainerRoman sprites
static constexpr std::array<uint8_t, 6> kPeepAnimationSequenceEntertainerRomanNone = { 0, 1, 2, 3, 4, 5 };
static constexpr std::array<uint8_t, 6> kPeepAnimationSequenceEntertainerRomanWalking = { 0, 1, 2, 3, 4, 5 };
static constexpr std::array<uint8_t, 1> kPeepAnimationSequenceEntertainerRomanWatchRide = { 0 };
static constexpr std::array<uint8_t, 21> kPeepAnimationSequenceEntertainerRomanEatFood = { 0, 1, 2, 3, 4, 5, 6, 7, 7, 7, 7, 7, 7, 7, 6, 5, 4, 3, 2, 1, 0 };
static constexpr std::array<uint8_t, 12> kPeepAnimationSequenceEntertainerRomanHanging = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 };
@@ -323,7 +323,7 @@ namespace OpenRCT2
// Define animation group for EntertainerRoman sequences
static PeepAnimations kPeepAnimationsEntertainerRoman = []() {
PeepAnimations pag;
pag[PeepAnimationType::None] = { kEntertainerSpriteRomanStateNoneId, kPeepAnimationSequenceEntertainerRomanNone };
pag[PeepAnimationType::Walking] = { kEntertainerSpriteRomanStateWalkingId, kPeepAnimationSequenceEntertainerRomanWalking };
pag[PeepAnimationType::WatchRide] = { kEntertainerSpriteRomanStateWatchRideId, kPeepAnimationSequenceEntertainerRomanWatchRide };
pag[PeepAnimationType::EatFood] = { kEntertainerSpriteRomanStateWaveId, kPeepAnimationSequenceEntertainerRomanEatFood };
pag[PeepAnimationType::Hanging] = { kEntertainerSpriteRomanStateHangingId, kPeepAnimationSequenceEntertainerRomanHanging };
@@ -334,7 +334,7 @@ namespace OpenRCT2
}();
// Define animation sequences for EntertainerGorilla sprites
static constexpr std::array<uint8_t, 6> kPeepAnimationSequenceEntertainerGorillaNone = { 0, 1, 2, 3, 4, 5 };
static constexpr std::array<uint8_t, 6> kPeepAnimationSequenceEntertainerGorillaWalking = { 0, 1, 2, 3, 4, 5 };
static constexpr std::array<uint8_t, 1> kPeepAnimationSequenceEntertainerGorillaWatchRide = { 0 };
static constexpr std::array<uint8_t, 39> kPeepAnimationSequenceEntertainerGorillaEatFood = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 9, 8, 7, 8, 9, 10, 9, 8, 7, 8, 9, 10, 9, 8, 7, 8, 9, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0 };
static constexpr std::array<uint8_t, 12> kPeepAnimationSequenceEntertainerGorillaHanging = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 };
@@ -345,7 +345,7 @@ namespace OpenRCT2
// Define animation group for EntertainerGorilla sequences
static PeepAnimations kPeepAnimationsEntertainerGorilla = []() {
PeepAnimations pag;
pag[PeepAnimationType::None] = { kEntertainerSpriteGorillaStateNoneId, kPeepAnimationSequenceEntertainerGorillaNone };
pag[PeepAnimationType::Walking] = { kEntertainerSpriteGorillaStateWalkingId, kPeepAnimationSequenceEntertainerGorillaWalking };
pag[PeepAnimationType::WatchRide] = { kEntertainerSpriteGorillaStateWatchRideId, kPeepAnimationSequenceEntertainerGorillaWatchRide };
pag[PeepAnimationType::EatFood] = { kEntertainerSpriteGorillaStateWaveId, kPeepAnimationSequenceEntertainerGorillaEatFood };
pag[PeepAnimationType::Hanging] = { kEntertainerSpriteGorillaStateHangingId, kPeepAnimationSequenceEntertainerGorillaHanging };
@@ -356,7 +356,7 @@ namespace OpenRCT2
}();
// Define animation sequences for EntertainerSnowman sprites
static constexpr std::array<uint8_t, 6> kPeepAnimationSequenceEntertainerSnowmanNone = { 0, 1, 2, 3, 4, 5 };
static constexpr std::array<uint8_t, 6> kPeepAnimationSequenceEntertainerSnowmanWalking = { 0, 1, 2, 3, 4, 5 };
static constexpr std::array<uint8_t, 1> kPeepAnimationSequenceEntertainerSnowmanWatchRide = { 0 };
static constexpr std::array<uint8_t, 65> kPeepAnimationSequenceEntertainerSnowmanEatFood = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 16, 17, 18, 19, 16, 17, 18, 19, 16, 17, 18, 19, 16, 17, 18, 19, 16, 17, 18, 19, 16, 17, 18, 19, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 31, 31, 31, 32, 33 };
static constexpr std::array<uint8_t, 12> kPeepAnimationSequenceEntertainerSnowmanHanging = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 };
@@ -367,7 +367,7 @@ namespace OpenRCT2
// Define animation group for EntertainerSnowman sequences
static PeepAnimations kPeepAnimationsEntertainerSnowman = []() {
PeepAnimations pag;
pag[PeepAnimationType::None] = { kEntertainerSpriteSnowmanStateNoneId, kPeepAnimationSequenceEntertainerSnowmanNone };
pag[PeepAnimationType::Walking] = { kEntertainerSpriteSnowmanStateWalkingId, kPeepAnimationSequenceEntertainerSnowmanWalking };
pag[PeepAnimationType::WatchRide] = { kEntertainerSpriteSnowmanStateWatchRideId, kPeepAnimationSequenceEntertainerSnowmanWatchRide };
pag[PeepAnimationType::EatFood] = { kEntertainerSpriteSnowmanStateWaveId, kPeepAnimationSequenceEntertainerSnowmanEatFood };
pag[PeepAnimationType::Hanging] = { kEntertainerSpriteSnowmanStateHangingId, kPeepAnimationSequenceEntertainerSnowmanHanging };
@@ -378,7 +378,7 @@ namespace OpenRCT2
}();
// Define animation sequences for EntertainerKnight sprites
static constexpr std::array<uint8_t, 6> kPeepAnimationSequenceEntertainerKnightNone = { 0, 1, 2, 3, 4, 5 };
static constexpr std::array<uint8_t, 6> kPeepAnimationSequenceEntertainerKnightWalking = { 0, 1, 2, 3, 4, 5 };
static constexpr std::array<uint8_t, 1> kPeepAnimationSequenceEntertainerKnightWatchRide = { 0 };
static constexpr std::array<uint8_t, 47> kPeepAnimationSequenceEntertainerKnightEatFood = { 0, 1, 2, 3, 4, 5, 6, 7, 7, 7, 7, 7, 7, 7, 7, 8, 9, 10, 11, 12, 12, 12, 12, 12, 13, 14, 15, 16, 17, 17, 17, 17, 17, 18, 19, 20, 21, 22, 23, 23, 23, 23, 23, 24, 25, 26, 27 };
static constexpr std::array<uint8_t, 12> kPeepAnimationSequenceEntertainerKnightHanging = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 };
@@ -389,7 +389,7 @@ namespace OpenRCT2
// Define animation group for EntertainerKnight sequences
static PeepAnimations kPeepAnimationsEntertainerKnight = []() {
PeepAnimations pag;
pag[PeepAnimationType::None] = { kEntertainerSpriteKnightStateNoneId, kPeepAnimationSequenceEntertainerKnightNone };
pag[PeepAnimationType::Walking] = { kEntertainerSpriteKnightStateWalkingId, kPeepAnimationSequenceEntertainerKnightWalking };
pag[PeepAnimationType::WatchRide] = { kEntertainerSpriteKnightStateWatchRideId, kPeepAnimationSequenceEntertainerKnightWatchRide };
pag[PeepAnimationType::EatFood] = { kEntertainerSpriteKnightStateWaveId, kPeepAnimationSequenceEntertainerKnightEatFood };
pag[PeepAnimationType::Hanging] = { kEntertainerSpriteKnightStateHangingId, kPeepAnimationSequenceEntertainerKnightHanging };
@@ -400,7 +400,7 @@ namespace OpenRCT2
}();
// Define animation sequences for EntertainerAstronaut sprites
static constexpr std::array<uint8_t, 6> kPeepAnimationSequenceEntertainerAstronautNone = { 0, 1, 2, 3, 4, 5 };
static constexpr std::array<uint8_t, 6> kPeepAnimationSequenceEntertainerAstronautWalking = { 0, 1, 2, 3, 4, 5 };
static constexpr std::array<uint8_t, 1> kPeepAnimationSequenceEntertainerAstronautWatchRide = { 0 };
static constexpr std::array<uint8_t, 19> kPeepAnimationSequenceEntertainerAstronautEatFood = { 0, 1, 2, 3, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 6, 7, 8, 9, 0 };
static constexpr std::array<uint8_t, 12> kPeepAnimationSequenceEntertainerAstronautHanging = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 };
@@ -411,7 +411,7 @@ namespace OpenRCT2
// Define animation group for EntertainerAstronaut sequences
static PeepAnimations kPeepAnimationsEntertainerAstronaut = []() {
PeepAnimations pag;
pag[PeepAnimationType::None] = { kEntertainerSpriteAstronautStateNoneId, kPeepAnimationSequenceEntertainerAstronautNone };
pag[PeepAnimationType::Walking] = { kEntertainerSpriteAstronautStateWalkingId, kPeepAnimationSequenceEntertainerAstronautWalking };
pag[PeepAnimationType::WatchRide] = { kEntertainerSpriteAstronautStateWatchRideId, kPeepAnimationSequenceEntertainerAstronautWatchRide };
pag[PeepAnimationType::EatFood] = { kEntertainerSpriteAstronautStateWaveId, kPeepAnimationSequenceEntertainerAstronautEatFood };
pag[PeepAnimationType::Hanging] = { kEntertainerSpriteAstronautStateHangingId, kPeepAnimationSequenceEntertainerAstronautHanging };
@@ -422,7 +422,7 @@ namespace OpenRCT2
}();
// Define animation sequences for EntertainerBandit sprites
static constexpr std::array<uint8_t, 6> kPeepAnimationSequenceEntertainerBanditNone = { 0, 1, 2, 3, 4, 5 };
static constexpr std::array<uint8_t, 6> kPeepAnimationSequenceEntertainerBanditWalking = { 0, 1, 2, 3, 4, 5 };
static constexpr std::array<uint8_t, 1> kPeepAnimationSequenceEntertainerBanditWatchRide = { 0 };
static constexpr std::array<uint8_t, 111> kPeepAnimationSequenceEntertainerBanditEatFood = { 0, 1, 2, 3, 4, 5, 6, 7, 7, 7, 7, 7, 8, 9, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 11, 12, 13, 13, 13, 13, 13, 14, 15, 16, 17, 17, 17, 17, 17, 18, 19, 20, 21, 22, 21, 20, 19, 20, 21, 22, 21, 20, 19, 20, 21, 22, 21, 20, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 31, 32, 33, 34, 35, 36, 31, 32, 33, 34, 35, 36, 31, 32, 33, 34, 35, 36, 31, 32, 33, 34, 35, 36, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41 };
static constexpr std::array<uint8_t, 12> kPeepAnimationSequenceEntertainerBanditHanging = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 };
@@ -433,7 +433,7 @@ namespace OpenRCT2
// Define animation group for EntertainerBandit sequences
static PeepAnimations kPeepAnimationsEntertainerBandit = []() {
PeepAnimations pag;
pag[PeepAnimationType::None] = { kEntertainerSpriteBanditStateNoneId, kPeepAnimationSequenceEntertainerBanditNone };
pag[PeepAnimationType::Walking] = { kEntertainerSpriteBanditStateWalkingId, kPeepAnimationSequenceEntertainerBanditWalking };
pag[PeepAnimationType::WatchRide] = { kEntertainerSpriteBanditStateWatchRideId, kPeepAnimationSequenceEntertainerBanditWatchRide };
pag[PeepAnimationType::EatFood] = { kEntertainerSpriteBanditStateWaveId, kPeepAnimationSequenceEntertainerBanditEatFood };
pag[PeepAnimationType::Hanging] = { kEntertainerSpriteBanditStateHangingId, kPeepAnimationSequenceEntertainerBanditHanging };
@@ -444,7 +444,7 @@ namespace OpenRCT2
}();
// Define animation sequences for EntertainerSheriff sprites
static constexpr std::array<uint8_t, 6> kPeepAnimationSequenceEntertainerSheriffNone = { 0, 1, 2, 3, 4, 5 };
static constexpr std::array<uint8_t, 6> kPeepAnimationSequenceEntertainerSheriffWalking = { 0, 1, 2, 3, 4, 5 };
static constexpr std::array<uint8_t, 1> kPeepAnimationSequenceEntertainerSheriffWatchRide = { 0 };
static constexpr std::array<uint8_t, 48> kPeepAnimationSequenceEntertainerSheriffEatFood = { 0, 1, 2, 3, 4, 5, 6, 7, 7, 7, 7, 7, 8, 9, 10, 11, 12, 11, 10, 11, 12, 11, 10, 11, 12, 11, 10, 11, 12, 11, 10, 11, 12, 11, 10, 11, 12, 11, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0 };
static constexpr std::array<uint8_t, 12> kPeepAnimationSequenceEntertainerSheriffHanging = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 };
@@ -455,7 +455,7 @@ namespace OpenRCT2
// Define animation group for EntertainerSheriff sequences
static PeepAnimations kPeepAnimationsEntertainerSheriff = []() {
PeepAnimations pag;
pag[PeepAnimationType::None] = { kEntertainerSpriteSheriffStateNoneId, kPeepAnimationSequenceEntertainerSheriffNone };
pag[PeepAnimationType::Walking] = { kEntertainerSpriteSheriffStateWalkingId, kPeepAnimationSequenceEntertainerSheriffWalking };
pag[PeepAnimationType::WatchRide] = { kEntertainerSpriteSheriffStateWatchRideId, kPeepAnimationSequenceEntertainerSheriffWatchRide };
pag[PeepAnimationType::EatFood] = { kEntertainerSpriteSheriffStateWaveId, kPeepAnimationSequenceEntertainerSheriffEatFood };
pag[PeepAnimationType::Hanging] = { kEntertainerSpriteSheriffStateHangingId, kPeepAnimationSequenceEntertainerSheriffHanging };
@@ -466,7 +466,7 @@ namespace OpenRCT2
}();
// Define animation sequences for EntertainerPirate sprites
static constexpr std::array<uint8_t, 6> kPeepAnimationSequenceEntertainerPirateNone = { 0, 1, 2, 3, 4, 5 };
static constexpr std::array<uint8_t, 6> kPeepAnimationSequenceEntertainerPirateWalking = { 0, 1, 2, 3, 4, 5 };
static constexpr std::array<uint8_t, 1> kPeepAnimationSequenceEntertainerPirateWatchRide = { 0 };
static constexpr std::array<uint8_t, 67> kPeepAnimationSequenceEntertainerPirateEatFood = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 9, 10, 11, 12, 13, 14, 15, 16, 9, 10, 11, 12, 13, 14, 15, 16, 18, 19, 20, 21, 21, 21, 21, 21, 21, 22, 23, 23, 23, 23, 24, 25, 26, 27, 27, 27, 27, 28, 29, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 31 };
static constexpr std::array<uint8_t, 12> kPeepAnimationSequenceEntertainerPirateHanging = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 };
@@ -477,7 +477,7 @@ namespace OpenRCT2
// Define animation group for EntertainerPirate sequences
static PeepAnimations kPeepAnimationsEntertainerPirate = []() {
PeepAnimations pag;
pag[PeepAnimationType::None] = { kEntertainerSpritePirateStateNoneId, kPeepAnimationSequenceEntertainerPirateNone };
pag[PeepAnimationType::Walking] = { kEntertainerSpritePirateStateWalkingId, kPeepAnimationSequenceEntertainerPirateWalking };
pag[PeepAnimationType::WatchRide] = { kEntertainerSpritePirateStateWatchRideId, kPeepAnimationSequenceEntertainerPirateWatchRide };
pag[PeepAnimationType::EatFood] = { kEntertainerSpritePirateStateWaveId, kPeepAnimationSequenceEntertainerPirateEatFood };
pag[PeepAnimationType::Hanging] = { kEntertainerSpritePirateStateHangingId, kPeepAnimationSequenceEntertainerPirateHanging };
@@ -488,7 +488,7 @@ namespace OpenRCT2
}();
// Define animation sequences for IceCream sprites
static constexpr std::array<uint8_t, 42> kPeepAnimationSequenceIceCreamNone = { 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 };
static constexpr std::array<uint8_t, 42> kPeepAnimationSequenceIceCreamWalking = { 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 };
static constexpr std::array<uint8_t, 1> kPeepAnimationSequenceIceCreamWatchRide = { 0 };
static constexpr std::array<uint8_t, 6> kPeepAnimationSequenceIceCreamEatFood = { 0, 1, 2, 3, 4, 5 };
static constexpr std::array<uint8_t, 1> kPeepAnimationSequenceIceCreamSittingIdle = { 0 };
@@ -497,7 +497,7 @@ namespace OpenRCT2
// Define animation group for IceCream sequences
static PeepAnimations kPeepAnimationsIceCream = []() {
PeepAnimations pag = kPeepAnimationsNormal;
pag[PeepAnimationType::None] = { kPeepSpriteIceCreamStateNoneId, kPeepAnimationSequenceIceCreamNone };
pag[PeepAnimationType::Walking] = { kPeepSpriteIceCreamStateWalkingId, kPeepAnimationSequenceIceCreamWalking };
pag[PeepAnimationType::WatchRide] = { kPeepSpriteIceCreamStateWatchRideId, kPeepAnimationSequenceIceCreamWatchRide };
pag[PeepAnimationType::EatFood] = { kPeepSpriteIceCreamStateEatFoodId, kPeepAnimationSequenceIceCreamEatFood };
pag[PeepAnimationType::SittingIdle] = { kPeepSpriteIceCreamStateSittingIdleId, kPeepAnimationSequenceIceCreamSittingIdle };
@@ -506,7 +506,7 @@ namespace OpenRCT2
}();
// Define animation sequences for Chips sprites
static constexpr std::array<uint8_t, 36> kPeepAnimationSequenceChipsNone = { 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17 };
static constexpr std::array<uint8_t, 36> kPeepAnimationSequenceChipsWalking = { 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17 };
static constexpr std::array<uint8_t, 1> kPeepAnimationSequenceChipsWatchRide = { 0 };
static constexpr std::array<uint8_t, 12> kPeepAnimationSequenceChipsEatFood = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 };
static constexpr std::array<uint8_t, 1> kPeepAnimationSequenceChipsSittingIdle = { 0 };
@@ -515,7 +515,7 @@ namespace OpenRCT2
// Define animation group for Chips sequences
static PeepAnimations kPeepAnimationsChips = []() {
PeepAnimations pag = kPeepAnimationsNormal;
pag[PeepAnimationType::None] = { kPeepSpriteChipsStateNoneId, kPeepAnimationSequenceChipsNone };
pag[PeepAnimationType::Walking] = { kPeepSpriteChipsStateWalkingId, kPeepAnimationSequenceChipsWalking };
pag[PeepAnimationType::WatchRide] = { kPeepSpriteChipsStateWatchRideId, kPeepAnimationSequenceChipsWatchRide };
pag[PeepAnimationType::EatFood] = { kPeepSpriteChipsStateEatFoodId, kPeepAnimationSequenceChipsEatFood };
pag[PeepAnimationType::SittingIdle] = { kPeepSpriteChipsStateSittingIdleId, kPeepAnimationSequenceChipsSittingIdle };
@@ -524,7 +524,7 @@ namespace OpenRCT2
}();
// Define animation sequences for Burger sprites
static constexpr std::array<uint8_t, 36> kPeepAnimationSequenceBurgerNone = { 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17 };
static constexpr std::array<uint8_t, 36> kPeepAnimationSequenceBurgerWalking = { 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17 };
static constexpr std::array<uint8_t, 1> kPeepAnimationSequenceBurgerWatchRide = { 0 };
static constexpr std::array<uint8_t, 12> kPeepAnimationSequenceBurgerEatFood = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 };
static constexpr std::array<uint8_t, 1> kPeepAnimationSequenceBurgerSittingIdle = { 0 };
@@ -533,7 +533,7 @@ namespace OpenRCT2
// Define animation group for Burger sequences
static PeepAnimations kPeepAnimationsBurger = []() {
PeepAnimations pag = kPeepAnimationsNormal;
pag[PeepAnimationType::None] = { kPeepSpriteBurgerStateNoneId, kPeepAnimationSequenceBurgerNone };
pag[PeepAnimationType::Walking] = { kPeepSpriteBurgerStateWalkingId, kPeepAnimationSequenceBurgerWalking };
pag[PeepAnimationType::WatchRide] = { kPeepSpriteBurgerStateWatchRideId, kPeepAnimationSequenceBurgerWatchRide };
pag[PeepAnimationType::EatFood] = { kPeepSpriteBurgerStateEatFoodId, kPeepAnimationSequenceBurgerEatFood };
pag[PeepAnimationType::SittingIdle] = { kPeepSpriteBurgerStateSittingIdleId, kPeepAnimationSequenceBurgerSittingIdle };
@@ -542,7 +542,7 @@ namespace OpenRCT2
}();
// Define animation sequences for Drink sprites
static constexpr std::array<uint8_t, 48> kPeepAnimationSequenceDrinkNone = { 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17 };
static constexpr std::array<uint8_t, 48> kPeepAnimationSequenceDrinkWalking = { 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17 };
static constexpr std::array<uint8_t, 1> kPeepAnimationSequenceDrinkWatchRide = { 0 };
static constexpr std::array<uint8_t, 12> kPeepAnimationSequenceDrinkEatFood = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 };
static constexpr std::array<uint8_t, 1> kPeepAnimationSequenceDrinkSittingIdle = { 0 };
@@ -551,7 +551,7 @@ namespace OpenRCT2
// Define animation group for Drink sequences
static PeepAnimations kPeepAnimationsDrink = []() {
PeepAnimations pag = kPeepAnimationsNormal;
pag[PeepAnimationType::None] = { kPeepSpriteDrinkStateNoneId, kPeepAnimationSequenceDrinkNone };
pag[PeepAnimationType::Walking] = { kPeepSpriteDrinkStateWalkingId, kPeepAnimationSequenceDrinkWalking };
pag[PeepAnimationType::WatchRide] = { kPeepSpriteDrinkStateWatchRideId, kPeepAnimationSequenceDrinkWatchRide };
pag[PeepAnimationType::EatFood] = { kPeepSpriteDrinkStateEatFoodId, kPeepAnimationSequenceDrinkEatFood };
pag[PeepAnimationType::SittingIdle] = { kPeepSpriteDrinkStateSittingIdleId, kPeepAnimationSequenceDrinkSittingIdle };
@@ -560,21 +560,21 @@ namespace OpenRCT2
}();
// Define animation sequences for Balloon sprites
static constexpr std::array<uint8_t, 6> kPeepAnimationSequenceBalloonNone = { 0, 1, 2, 3, 4, 5 };
static constexpr std::array<uint8_t, 6> kPeepAnimationSequenceBalloonWalking = { 0, 1, 2, 3, 4, 5 };
static constexpr std::array<uint8_t, 1> kPeepAnimationSequenceBalloonWatchRide = { 0 };
static constexpr std::array<uint8_t, 1> kPeepAnimationSequenceBalloonSittingIdle = { 0 };
// Define animation group for Balloon sequences
static PeepAnimations kPeepAnimationsBalloon = []() {
PeepAnimations pag = kPeepAnimationsNormal;
pag[PeepAnimationType::None] = { kPeepSpriteBalloonStateNoneId, kPeepAnimationSequenceBalloonNone };
pag[PeepAnimationType::Walking] = { kPeepSpriteBalloonStateWalkingId, kPeepAnimationSequenceBalloonWalking };
pag[PeepAnimationType::WatchRide] = { kPeepSpriteBalloonStateWatchRideId, kPeepAnimationSequenceBalloonWatchRide };
pag[PeepAnimationType::SittingIdle] = { kPeepSpriteBalloonStateSittingIdleId, kPeepAnimationSequenceBalloonSittingIdle };
return pag;
}();
// Define animation sequences for Candyfloss sprites
static constexpr std::array<uint8_t, 36> kPeepAnimationSequenceCandyflossNone = { 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17 };
static constexpr std::array<uint8_t, 36> kPeepAnimationSequenceCandyflossWalking = { 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17 };
static constexpr std::array<uint8_t, 1> kPeepAnimationSequenceCandyflossWatchRide = { 0 };
static constexpr std::array<uint8_t, 12> kPeepAnimationSequenceCandyflossEatFood = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 };
static constexpr std::array<uint8_t, 1> kPeepAnimationSequenceCandyflossSittingIdle = { 0 };
@@ -583,7 +583,7 @@ namespace OpenRCT2
// Define animation group for Candyfloss sequences
static PeepAnimations kPeepAnimationsCandyfloss = []() {
PeepAnimations pag = kPeepAnimationsNormal;
pag[PeepAnimationType::None] = { kPeepSpriteCandyflossStateNoneId, kPeepAnimationSequenceCandyflossNone };
pag[PeepAnimationType::Walking] = { kPeepSpriteCandyflossStateWalkingId, kPeepAnimationSequenceCandyflossWalking };
pag[PeepAnimationType::WatchRide] = { kPeepSpriteCandyflossStateWatchRideId, kPeepAnimationSequenceCandyflossWatchRide };
pag[PeepAnimationType::EatFood] = { kPeepSpriteCandyflossStateEatFoodId, kPeepAnimationSequenceCandyflossEatFood };
pag[PeepAnimationType::SittingIdle] = { kPeepSpriteCandyflossStateSittingIdleId, kPeepAnimationSequenceCandyflossSittingIdle };
@@ -592,21 +592,21 @@ namespace OpenRCT2
}();
// Define animation sequences for Umbrella sprites
static constexpr std::array<uint8_t, 6> kPeepAnimationSequenceUmbrellaNone = { 0, 1, 2, 3, 4, 5 };
static constexpr std::array<uint8_t, 6> kPeepAnimationSequenceUmbrellaWalking = { 0, 1, 2, 3, 4, 5 };
static constexpr std::array<uint8_t, 1> kPeepAnimationSequenceUmbrellaWatchRide = { 0 };
static constexpr std::array<uint8_t, 1> kPeepAnimationSequenceUmbrellaSittingIdle = { 0 };
// Define animation group for Umbrella sequences
static PeepAnimations kPeepAnimationsUmbrella = []() {
PeepAnimations pag = kPeepAnimationsNormal;
pag[PeepAnimationType::None] = { kPeepSpriteUmbrellaStateNoneId, kPeepAnimationSequenceUmbrellaNone };
pag[PeepAnimationType::Walking] = { kPeepSpriteUmbrellaStateWalkingId, kPeepAnimationSequenceUmbrellaWalking };
pag[PeepAnimationType::WatchRide] = { kPeepSpriteUmbrellaStateWatchRideId, kPeepAnimationSequenceUmbrellaWatchRide };
pag[PeepAnimationType::SittingIdle] = { kPeepSpriteUmbrellaStateSittingIdleId, kPeepAnimationSequenceUmbrellaSittingIdle };
return pag;
}();
// Define animation sequences for Pizza sprites
static constexpr std::array<uint8_t, 30> kPeepAnimationSequencePizzaNone = { 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 };
static constexpr std::array<uint8_t, 30> kPeepAnimationSequencePizzaWalking = { 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 };
static constexpr std::array<uint8_t, 1> kPeepAnimationSequencePizzaWatchRide = { 0 };
static constexpr std::array<uint8_t, 6> kPeepAnimationSequencePizzaEatFood = { 0, 1, 2, 3, 4, 5 };
static constexpr std::array<uint8_t, 1> kPeepAnimationSequencePizzaSittingIdle = { 0 };
@@ -615,7 +615,7 @@ namespace OpenRCT2
// Define animation group for Pizza sequences
static PeepAnimations kPeepAnimationsPizza = []() {
PeepAnimations pag = kPeepAnimationsNormal;
pag[PeepAnimationType::None] = { kPeepSpritePizzaStateNoneId, kPeepAnimationSequencePizzaNone };
pag[PeepAnimationType::Walking] = { kPeepSpritePizzaStateWalkingId, kPeepAnimationSequencePizzaWalking };
pag[PeepAnimationType::WatchRide] = { kPeepSpritePizzaStateWatchRideId, kPeepAnimationSequencePizzaWatchRide };
pag[PeepAnimationType::EatFood] = { kPeepSpritePizzaStateEatFoodId, kPeepAnimationSequencePizzaEatFood };
pag[PeepAnimationType::SittingIdle] = { kPeepSpritePizzaStateSittingIdleId, kPeepAnimationSequencePizzaSittingIdle };
@@ -624,7 +624,7 @@ namespace OpenRCT2
}();
// Define animation sequences for SecurityAlt sprites
static constexpr std::array<uint8_t, 6> kPeepAnimationSequenceSecurityAltNone = { 0, 1, 2, 3, 4, 5 };
static constexpr std::array<uint8_t, 6> kPeepAnimationSequenceSecurityAltWalking = { 0, 1, 2, 3, 4, 5 };
static constexpr std::array<uint8_t, 1> kPeepAnimationSequenceSecurityAltWatchRide = { 0 };
static constexpr std::array<uint8_t, 12> kPeepAnimationSequenceSecurityAltHanging = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 };
static constexpr std::array<uint8_t, 64> kPeepAnimationSequenceSecurityAltDrowning = { 0, 1, 2, 3, 2, 1, 0, 1, 2, 3, 2, 1, 0, 1, 2, 3, 2, 1, 0, 1, 2, 3, 2, 1, 0, 1, 2, 3, 2, 1, 0, 1, 2, 3, 2, 1, 0, 1, 2, 3, 2, 1, 0, 1, 2, 3, 2, 1, 0, 1, 2, 3, 2, 1, 0, 1, 2, 3, 2, 1, 0, 4, 5, 6 };
@@ -632,15 +632,15 @@ namespace OpenRCT2
// Define animation group for SecurityAlt sequences
static PeepAnimations kPeepAnimationsSecurityAlt = []() {
PeepAnimations pag;
pag[PeepAnimationType::None] = { kSecurityStaffSpriteAltStateNoneId, kPeepAnimationSequenceSecurityAltNone };
pag[PeepAnimationType::WatchRide] = { kSecuritySpriteStateWatchRideId, kPeepAnimationSequenceSecurityAltWatchRide };
pag[PeepAnimationType::Hanging] = { kSecuritySpriteStateHangingId, kPeepAnimationSequenceSecurityAltHanging };
pag[PeepAnimationType::Drowning] = { kSecuritySpriteStateDrowningId, kPeepAnimationSequenceSecurityAltDrowning };
pag[PeepAnimationType::Walking] = { kSecurityStaffSpriteAltStateWalkingId, kPeepAnimationSequenceSecurityAltWalking };
pag[PeepAnimationType::WatchRide] = { kSecuritySpriteStateWatchRideId, kPeepAnimationSequenceSecurityAltWatchRide };
pag[PeepAnimationType::Hanging] = { kSecuritySpriteStateHangingId, kPeepAnimationSequenceSecurityAltHanging };
pag[PeepAnimationType::Drowning] = { kSecuritySpriteStateDrowningId, kPeepAnimationSequenceSecurityAltDrowning };
return pag;
}();
// Define animation sequences for Popcorn sprites
static constexpr std::array<uint8_t, 36> kPeepAnimationSequencePopcornNone = { 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17 };
static constexpr std::array<uint8_t, 36> kPeepAnimationSequencePopcornWalking = { 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17 };
static constexpr std::array<uint8_t, 1> kPeepAnimationSequencePopcornWatchRide = { 0 };
static constexpr std::array<uint8_t, 12> kPeepAnimationSequencePopcornEatFood = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 };
static constexpr std::array<uint8_t, 1> kPeepAnimationSequencePopcornSittingIdle = { 0 };
@@ -649,7 +649,7 @@ namespace OpenRCT2
// Define animation group for Popcorn sequences
static PeepAnimations kPeepAnimationsPopcorn = []() {
PeepAnimations pag = kPeepAnimationsNormal;
pag[PeepAnimationType::None] = { kPeepSpritePopcornStateNoneId, kPeepAnimationSequencePopcornNone };
pag[PeepAnimationType::Walking] = { kPeepSpritePopcornStateWalkingId, kPeepAnimationSequencePopcornWalking };
pag[PeepAnimationType::WatchRide] = { kPeepSpritePopcornStateWatchRideId, kPeepAnimationSequencePopcornWatchRide };
pag[PeepAnimationType::EatFood] = { kPeepSpritePopcornStateEatFoodId, kPeepAnimationSequencePopcornEatFood };
pag[PeepAnimationType::SittingIdle] = { kPeepSpritePopcornStateSittingIdleId, kPeepAnimationSequencePopcornSittingIdle };
@@ -658,75 +658,75 @@ namespace OpenRCT2
}();
// Define animation sequences for ArmsCrossed sprites
static constexpr std::array<uint8_t, 6> kPeepAnimationSequenceArmsCrossedNone = { 0, 1, 2, 3, 4, 5 };
static constexpr std::array<uint8_t, 6> kPeepAnimationSequenceArmsCrossedWalking = { 0, 1, 2, 3, 4, 5 };
// Define animation group for ArmsCrossed sequences
static PeepAnimations kPeepAnimationsArmsCrossed = []() {
PeepAnimations pag = kPeepAnimationsNormal;
pag[PeepAnimationType::None] = { kPeepSpriteArmsCrossedStateNoneId, kPeepAnimationSequenceArmsCrossedNone };
pag[PeepAnimationType::Walking] = { kPeepSpriteArmsCrossedStateWalkingId, kPeepAnimationSequenceArmsCrossedWalking };
return pag;
}();
// Define animation sequences for HeadDown sprites
static constexpr std::array<uint8_t, 6> kPeepAnimationSequenceHeadDownNone = { 0, 1, 2, 3, 4, 5 };
static constexpr std::array<uint8_t, 6> kPeepAnimationSequenceHeadDownWalking = { 0, 1, 2, 3, 4, 5 };
// Define animation group for HeadDown sequences
static PeepAnimations kPeepAnimationsHeadDown = []() {
PeepAnimations pag = kPeepAnimationsNormal;
pag[PeepAnimationType::None] = { kPeepSpriteHeadDownStateNoneId, kPeepAnimationSequenceHeadDownNone };
pag[PeepAnimationType::Walking] = { kPeepSpriteHeadDownStateWalkingId, kPeepAnimationSequenceHeadDownWalking };
return pag;
}();
// Define animation sequences for Nauseous sprites
static constexpr std::array<uint8_t, 6> kPeepAnimationSequenceNauseousNone = { 0, 1, 2, 3, 4, 5 };
static constexpr std::array<uint8_t, 6> kPeepAnimationSequenceNauseousWalking = { 0, 1, 2, 3, 4, 5 };
// Define animation group for Nauseous sequences
static PeepAnimations kPeepAnimationsNauseous = []() {
PeepAnimations pag = kPeepAnimationsNormal;
pag[PeepAnimationType::None] = { kPeepSpriteNauseousStateNoneId, kPeepAnimationSequenceNauseousNone };
pag[PeepAnimationType::Walking] = { kPeepSpriteNauseousStateWalkingId, kPeepAnimationSequenceNauseousWalking };
return pag;
}();
// Define animation sequences for VeryNauseous sprites
static constexpr std::array<uint8_t, 6> kPeepAnimationSequenceVeryNauseousNone = { 0, 1, 2, 3, 4, 5 };
static constexpr std::array<uint8_t, 6> kPeepAnimationSequenceVeryNauseousWalking = { 0, 1, 2, 3, 4, 5 };
static constexpr std::array<uint8_t, 1> kPeepAnimationSequenceVeryNauseousWatchRide = { 0 };
static constexpr std::array<uint8_t, 1> kPeepAnimationSequenceVeryNauseousSittingIdle = { 0 };
// Define animation group for VeryNauseous sequences
static PeepAnimations kPeepAnimationsVeryNauseous = []() {
PeepAnimations pag = kPeepAnimationsNormal;
pag[PeepAnimationType::None] = { kPeepSpriteVeryNauseousStateNoneId, kPeepAnimationSequenceVeryNauseousNone };
pag[PeepAnimationType::Walking] = { kPeepSpriteVeryNauseousStateWalkingId, kPeepAnimationSequenceVeryNauseousWalking };
pag[PeepAnimationType::WatchRide] = { kPeepSpriteVeryNauseousStateWatchRideId, kPeepAnimationSequenceVeryNauseousWatchRide };
pag[PeepAnimationType::SittingIdle] = { kPeepSpriteVeryNauseousStateSittingIdleId, kPeepAnimationSequenceVeryNauseousSittingIdle };
return pag;
}();
// Define animation sequences for RequireToilet sprites
static constexpr std::array<uint8_t, 6> kPeepAnimationSequenceRequireToiletNone = { 0, 1, 2, 3, 4, 5 };
static constexpr std::array<uint8_t, 6> kPeepAnimationSequenceRequireToiletWalking = { 0, 1, 2, 3, 4, 5 };
// Define animation group for RequireToilet sequences
static PeepAnimations kPeepAnimationsRequireToilet = []() {
PeepAnimations pag = kPeepAnimationsNormal;
pag[PeepAnimationType::None] = { kPeepSpriteRequireToiletStateNoneId, kPeepAnimationSequenceRequireToiletNone };
pag[PeepAnimationType::Walking] = { kPeepSpriteRequireToiletStateWalkingId, kPeepAnimationSequenceRequireToiletWalking };
return pag;
}();
// Define animation sequences for Hat sprites
static constexpr std::array<uint8_t, 6> kPeepAnimationSequenceHatNone = { 0, 1, 2, 3, 4, 5 };
static constexpr std::array<uint8_t, 6> kPeepAnimationSequenceHatWalking = { 0, 1, 2, 3, 4, 5 };
static constexpr std::array<uint8_t, 1> kPeepAnimationSequenceHatWatchRide = { 0 };
static constexpr std::array<uint8_t, 1> kPeepAnimationSequenceHatSittingIdle = { 0 };
// Define animation group for Hat sequences
static PeepAnimations kPeepAnimationsHat = []() {
PeepAnimations pag = kPeepAnimationsNormal;
pag[PeepAnimationType::None] = { kPeepSpriteHatStateNoneId, kPeepAnimationSequenceHatNone };
pag[PeepAnimationType::Walking] = { kPeepSpriteHatStateWalkingId, kPeepAnimationSequenceHatWalking };
pag[PeepAnimationType::WatchRide] = { kPeepSpriteHatStateWatchRideId, kPeepAnimationSequenceHatWatchRide };
pag[PeepAnimationType::SittingIdle] = { kPeepSpriteHatStateSittingIdleId, kPeepAnimationSequenceHatSittingIdle };
return pag;
}();
// Define animation sequences for HotDog sprites
static constexpr std::array<uint8_t, 36> kPeepAnimationSequenceHotDogNone = { 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17 };
static constexpr std::array<uint8_t, 36> kPeepAnimationSequenceHotDogWalking = { 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17 };
static constexpr std::array<uint8_t, 1> kPeepAnimationSequenceHotDogWatchRide = { 0 };
static constexpr std::array<uint8_t, 12> kPeepAnimationSequenceHotDogEatFood = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 };
static constexpr std::array<uint8_t, 1> kPeepAnimationSequenceHotDogSittingIdle = { 0 };
@@ -735,7 +735,7 @@ namespace OpenRCT2
// Define animation group for HotDog sequences
static PeepAnimations kPeepAnimationsHotDog = []() {
PeepAnimations pag = kPeepAnimationsNormal;
pag[PeepAnimationType::None] = { kPeepSpriteHotDogStateNoneId, kPeepAnimationSequenceHotDogNone };
pag[PeepAnimationType::Walking] = { kPeepSpriteHotDogStateWalkingId, kPeepAnimationSequenceHotDogWalking };
pag[PeepAnimationType::WatchRide] = { kPeepSpriteHotDogStateWatchRideId, kPeepAnimationSequenceHotDogWatchRide };
pag[PeepAnimationType::EatFood] = { kPeepSpriteHotDogStateEatFoodId, kPeepAnimationSequenceHotDogEatFood };
pag[PeepAnimationType::SittingIdle] = { kPeepSpriteHotDogStateSittingIdleId, kPeepAnimationSequenceHotDogSittingIdle };
@@ -744,7 +744,7 @@ namespace OpenRCT2
}();
// Define animation sequences for Tentacle sprites
static constexpr std::array<uint8_t, 48> kPeepAnimationSequenceTentacleNone = { 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29 };
static constexpr std::array<uint8_t, 48> kPeepAnimationSequenceTentacleWalking = { 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29 };
static constexpr std::array<uint8_t, 1> kPeepAnimationSequenceTentacleWatchRide = { 0 };
static constexpr std::array<uint8_t, 24> kPeepAnimationSequenceTentacleEatFood = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23 };
static constexpr std::array<uint8_t, 1> kPeepAnimationSequenceTentacleSittingIdle = { 0 };
@@ -753,7 +753,7 @@ namespace OpenRCT2
// Define animation group for Tentacle sequences
static PeepAnimations kPeepAnimationsTentacle = []() {
PeepAnimations pag = kPeepAnimationsNormal;
pag[PeepAnimationType::None] = { kPeepSpriteTentacleStateNoneId, kPeepAnimationSequenceTentacleNone };
pag[PeepAnimationType::Walking] = { kPeepSpriteTentacleStateWalkingId, kPeepAnimationSequenceTentacleWalking };
pag[PeepAnimationType::WatchRide] = { kPeepSpriteTentacleStateWatchRideId, kPeepAnimationSequenceTentacleWatchRide };
pag[PeepAnimationType::EatFood] = { kPeepSpriteTentacleStateEatFoodId, kPeepAnimationSequenceTentacleEatFood };
pag[PeepAnimationType::SittingIdle] = { kPeepSpriteTentacleStateSittingIdleId, kPeepAnimationSequenceTentacleSittingIdle };
@@ -762,7 +762,7 @@ namespace OpenRCT2
}();
// Define animation sequences for ToffeeApple sprites
static constexpr std::array<uint8_t, 42> kPeepAnimationSequenceToffeeAppleNone = { 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 };
static constexpr std::array<uint8_t, 42> kPeepAnimationSequenceToffeeAppleWalking = { 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 };
static constexpr std::array<uint8_t, 1> kPeepAnimationSequenceToffeeAppleWatchRide = { 0 };
static constexpr std::array<uint8_t, 6> kPeepAnimationSequenceToffeeAppleEatFood = { 0, 1, 2, 3, 4, 5 };
static constexpr std::array<uint8_t, 1> kPeepAnimationSequenceToffeeAppleSittingIdle = { 0 };
@@ -771,7 +771,7 @@ namespace OpenRCT2
// Define animation group for ToffeeApple sequences
static PeepAnimations kPeepAnimationsToffeeApple = []() {
PeepAnimations pag = kPeepAnimationsNormal;
pag[PeepAnimationType::None] = { kPeepSpriteToffeeAppleStateNoneId, kPeepAnimationSequenceToffeeAppleNone };
pag[PeepAnimationType::Walking] = { kPeepSpriteToffeeAppleStateWalkingId, kPeepAnimationSequenceToffeeAppleWalking };
pag[PeepAnimationType::WatchRide] = { kPeepSpriteToffeeAppleStateWatchRideId, kPeepAnimationSequenceToffeeAppleWatchRide };
pag[PeepAnimationType::EatFood] = { kPeepSpriteToffeeAppleStateEatFoodId, kPeepAnimationSequenceToffeeAppleEatFood };
pag[PeepAnimationType::SittingIdle] = { kPeepSpriteToffeeAppleStateSittingIdleId, kPeepAnimationSequenceToffeeAppleSittingIdle };
@@ -780,7 +780,7 @@ namespace OpenRCT2
}();
// Define animation sequences for Donut sprites
static constexpr std::array<uint8_t, 36> kPeepAnimationSequenceDonutNone = { 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17 };
static constexpr std::array<uint8_t, 36> kPeepAnimationSequenceDonutWalking = { 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17 };
static constexpr std::array<uint8_t, 1> kPeepAnimationSequenceDonutWatchRide = { 0 };
static constexpr std::array<uint8_t, 12> kPeepAnimationSequenceDonutEatFood = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 };
static constexpr std::array<uint8_t, 1> kPeepAnimationSequenceDonutSittingIdle = { 0 };
@@ -789,7 +789,7 @@ namespace OpenRCT2
// Define animation group for Donut sequences
static PeepAnimations kPeepAnimationsDonut = []() {
PeepAnimations pag = kPeepAnimationsNormal;
pag[PeepAnimationType::None] = { kPeepSpriteDonutStateNoneId, kPeepAnimationSequenceDonutNone };
pag[PeepAnimationType::Walking] = { kPeepSpriteDonutStateWalkingId, kPeepAnimationSequenceDonutWalking };
pag[PeepAnimationType::WatchRide] = { kPeepSpriteDonutStateWatchRideId, kPeepAnimationSequenceDonutWatchRide };
pag[PeepAnimationType::EatFood] = { kPeepSpriteDonutStateEatFoodId, kPeepAnimationSequenceDonutEatFood };
pag[PeepAnimationType::SittingIdle] = { kPeepSpriteDonutStateSittingIdleId, kPeepAnimationSequenceDonutSittingIdle };
@@ -798,7 +798,7 @@ namespace OpenRCT2
}();
// Define animation sequences for Coffee sprites
static constexpr std::array<uint8_t, 48> kPeepAnimationSequenceCoffeeNone = { 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17 };
static constexpr std::array<uint8_t, 48> kPeepAnimationSequenceCoffeeWalking = { 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17 };
static constexpr std::array<uint8_t, 1> kPeepAnimationSequenceCoffeeWatchRide = { 0 };
static constexpr std::array<uint8_t, 12> kPeepAnimationSequenceCoffeeEatFood = { 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1 };
static constexpr std::array<uint8_t, 1> kPeepAnimationSequenceCoffeeSittingIdle = { 0 };
@@ -807,7 +807,7 @@ namespace OpenRCT2
// Define animation group for Coffee sequences
static PeepAnimations kPeepAnimationsCoffee = []() {
PeepAnimations pag = kPeepAnimationsNormal;
pag[PeepAnimationType::None] = { kPeepSpriteCoffeeStateNoneId, kPeepAnimationSequenceCoffeeNone };
pag[PeepAnimationType::Walking] = { kPeepSpriteCoffeeStateWalkingId, kPeepAnimationSequenceCoffeeWalking };
pag[PeepAnimationType::WatchRide] = { kPeepSpriteCoffeeStateWatchRideId, kPeepAnimationSequenceCoffeeWatchRide };
pag[PeepAnimationType::EatFood] = { kPeepSpriteCoffeeStateWatchRideId, kPeepAnimationSequenceCoffeeEatFood };
pag[PeepAnimationType::SittingIdle] = { kPeepSpriteCoffeeStateSittingIdleId, kPeepAnimationSequenceCoffeeSittingIdle };
@@ -816,7 +816,7 @@ namespace OpenRCT2
}();
// Define animation sequences for Chicken sprites
static constexpr std::array<uint8_t, 48> kPeepAnimationSequenceChickenNone = { 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17 };
static constexpr std::array<uint8_t, 48> kPeepAnimationSequenceChickenWalking = { 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17 };
static constexpr std::array<uint8_t, 1> kPeepAnimationSequenceChickenWatchRide = { 0 };
static constexpr std::array<uint8_t, 12> kPeepAnimationSequenceChickenEatFood = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 };
static constexpr std::array<uint8_t, 1> kPeepAnimationSequenceChickenSittingIdle = { 0 };
@@ -825,7 +825,7 @@ namespace OpenRCT2
// Define animation group for Chicken sequences
static PeepAnimations kPeepAnimationsChicken = []() {
PeepAnimations pag = kPeepAnimationsNormal;
pag[PeepAnimationType::None] = { kPeepSpriteChickenStateNoneId, kPeepAnimationSequenceChickenNone };
pag[PeepAnimationType::Walking] = { kPeepSpriteChickenStateWalkingId, kPeepAnimationSequenceChickenWalking };
pag[PeepAnimationType::WatchRide] = { kPeepSpriteChickenStateWatchRideId, kPeepAnimationSequenceChickenWatchRide };
pag[PeepAnimationType::EatFood] = { kPeepSpriteChickenStateWatchRideId, kPeepAnimationSequenceChickenEatFood };
pag[PeepAnimationType::SittingIdle] = { kPeepSpriteChickenStateSittingIdleId, kPeepAnimationSequenceChickenSittingIdle };
@@ -834,7 +834,7 @@ namespace OpenRCT2
}();
// Define animation sequences for Lemonade sprites
static constexpr std::array<uint8_t, 48> kPeepAnimationSequenceLemonadeNone = { 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17 };
static constexpr std::array<uint8_t, 48> kPeepAnimationSequenceLemonadeWalking = { 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17 };
static constexpr std::array<uint8_t, 1> kPeepAnimationSequenceLemonadeWatchRide = { 0 };
static constexpr std::array<uint8_t, 12> kPeepAnimationSequenceLemonadeEatFood = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 };
static constexpr std::array<uint8_t, 1> kPeepAnimationSequenceLemonadeSittingIdle = { 0 };
@@ -843,7 +843,7 @@ namespace OpenRCT2
// Define animation group for Lemonade sequences
static PeepAnimations kPeepAnimationsLemonade = []() {
PeepAnimations pag = kPeepAnimationsNormal;
pag[PeepAnimationType::None] = { kPeepSpriteLemonadeStateNoneId, kPeepAnimationSequenceLemonadeNone };
pag[PeepAnimationType::Walking] = { kPeepSpriteLemonadeStateWalkingId, kPeepAnimationSequenceLemonadeWalking };
pag[PeepAnimationType::WatchRide] = { kPeepSpriteLemonadeStateWatchRideId, kPeepAnimationSequenceLemonadeWatchRide };
pag[PeepAnimationType::EatFood] = { kPeepSpriteLemonadeStateWatchRideId, kPeepAnimationSequenceLemonadeEatFood };
pag[PeepAnimationType::SittingIdle] = { kPeepSpriteLemonadeStateSittingIdleId, kPeepAnimationSequenceLemonadeSittingIdle };
@@ -862,7 +862,7 @@ namespace OpenRCT2
}();
// Define animation sequences for Pretzel sprites
static constexpr std::array<uint8_t, 48> kPeepAnimationSequencePretzelNone = { 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17 };
static constexpr std::array<uint8_t, 48> kPeepAnimationSequencePretzelWalking = { 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17 };
static constexpr std::array<uint8_t, 1> kPeepAnimationSequencePretzelWatchRide = { 0 };
static constexpr std::array<uint8_t, 12> kPeepAnimationSequencePretzelEatFood = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 };
static constexpr std::array<uint8_t, 1> kPeepAnimationSequencePretzelSittingIdle = { 0 };
@@ -871,7 +871,7 @@ namespace OpenRCT2
// Define animation group for Pretzel sequences
static PeepAnimations kPeepAnimationsPretzel = []() {
PeepAnimations pag = kPeepAnimationsNormal;
pag[PeepAnimationType::None] = { kPeepSpritePretzelStateNoneId, kPeepAnimationSequencePretzelNone };
pag[PeepAnimationType::Walking] = { kPeepSpritePretzelStateWalkingId, kPeepAnimationSequencePretzelWalking };
pag[PeepAnimationType::WatchRide] = { kPeepSpritePretzelStateWatchRideId, kPeepAnimationSequencePretzelWatchRide };
pag[PeepAnimationType::EatFood] = { kPeepSpritePretzelStateWatchRideId, kPeepAnimationSequencePretzelEatFood };
pag[PeepAnimationType::SittingIdle] = { kPeepSpritePretzelStateSittingIdleId, kPeepAnimationSequencePretzelSittingIdle };
@@ -880,21 +880,21 @@ namespace OpenRCT2
}();
// Define animation sequences for Sunglasses sprites
static constexpr std::array<uint8_t, 6> kPeepAnimationSequenceSunglassesNone = { 0, 1, 2, 3, 4, 5 };
static constexpr std::array<uint8_t, 6> kPeepAnimationSequenceSunglassesWalking = { 0, 1, 2, 3, 4, 5 };
static constexpr std::array<uint8_t, 1> kPeepAnimationSequenceSunglassesWatchRide = { 0 };
static constexpr std::array<uint8_t, 1> kPeepAnimationSequenceSunglassesSittingIdle = { 0 };
// Define animation group for Sunglasses sequences
static PeepAnimations kPeepAnimationsSunglasses = []() {
PeepAnimations pag = kPeepAnimationsNormal;
pag[PeepAnimationType::None] = { kPeepSpriteSunglassesStateNoneId, kPeepAnimationSequenceSunglassesNone };
pag[PeepAnimationType::Walking] = { kPeepSpriteSunglassesStateWalkingId, kPeepAnimationSequenceSunglassesWalking };
pag[PeepAnimationType::WatchRide] = { kPeepSpriteSunglassesStateWatchRideId, kPeepAnimationSequenceSunglassesWatchRide };
pag[PeepAnimationType::SittingIdle] = { kPeepSpriteSunglassesStateSittingIdleId, kPeepAnimationSequenceSunglassesSittingIdle };
return pag;
}();
// Define animation sequences for SuJongkwa sprites
static constexpr std::array<uint8_t, 48> kPeepAnimationSequenceSuJongkwaNone = { 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17 };
static constexpr std::array<uint8_t, 48> kPeepAnimationSequenceSuJongkwaWalking = { 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17 };
static constexpr std::array<uint8_t, 1> kPeepAnimationSequenceSuJongkwaWatchRide = { 0 };
static constexpr std::array<uint8_t, 12> kPeepAnimationSequenceSuJongkwaEatFood = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 };
static constexpr std::array<uint8_t, 1> kPeepAnimationSequenceSuJongkwaSittingIdle = { 0 };
@@ -903,7 +903,7 @@ namespace OpenRCT2
// Define animation group for SuJongkwa sequences
static PeepAnimations kPeepAnimationsSuJongkwa = []() {
PeepAnimations pag = kPeepAnimationsNormal;
pag[PeepAnimationType::None] = { kPeepSpriteSuJongkwaStateNoneId, kPeepAnimationSequenceSuJongkwaNone };
pag[PeepAnimationType::Walking] = { kPeepSpriteSuJongkwaStateWalkingId, kPeepAnimationSequenceSuJongkwaWalking };
pag[PeepAnimationType::WatchRide] = { kPeepSpriteSuJongkwaStateWatchRideId, kPeepAnimationSequenceSuJongkwaWatchRide };
pag[PeepAnimationType::EatFood] = { kPeepSpriteSuJongkwaStateWatchRideId, kPeepAnimationSequenceSuJongkwaEatFood };
pag[PeepAnimationType::SittingIdle] = { kPeepSpriteSuJongkwaStateSittingIdleId, kPeepAnimationSequenceSuJongkwaSittingIdle };
@@ -912,7 +912,7 @@ namespace OpenRCT2
}();
// Define animation sequences for Juice sprites
static constexpr std::array<uint8_t, 48> kPeepAnimationSequenceJuiceNone = { 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17 };
static constexpr std::array<uint8_t, 48> kPeepAnimationSequenceJuiceWalking = { 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17 };
static constexpr std::array<uint8_t, 1> kPeepAnimationSequenceJuiceWatchRide = { 0 };
static constexpr std::array<uint8_t, 12> kPeepAnimationSequenceJuiceEatFood = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 };
static constexpr std::array<uint8_t, 1> kPeepAnimationSequenceJuiceSittingIdle = { 0 };
@@ -921,7 +921,7 @@ namespace OpenRCT2
// Define animation group for Juice sequences
static PeepAnimations kPeepAnimationsJuice = []() {
PeepAnimations pag = kPeepAnimationsNormal;
pag[PeepAnimationType::None] = { kPeepSpriteJuiceStateNoneId, kPeepAnimationSequenceJuiceNone };
pag[PeepAnimationType::Walking] = { kPeepSpriteJuiceStateWalkingId, kPeepAnimationSequenceJuiceWalking };
pag[PeepAnimationType::WatchRide] = { kPeepSpriteJuiceStateWatchRideId, kPeepAnimationSequenceJuiceWatchRide };
pag[PeepAnimationType::EatFood] = { kPeepSpriteJuiceStateWatchRideId, kPeepAnimationSequenceJuiceEatFood };
pag[PeepAnimationType::SittingIdle] = { kPeepSpriteJuiceStateSittingIdleId, kPeepAnimationSequenceJuiceSittingIdle };
@@ -930,7 +930,7 @@ namespace OpenRCT2
}();
// Define animation sequences for FunnelCake sprites
static constexpr std::array<uint8_t, 48> kPeepAnimationSequenceFunnelCakeNone = { 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17 };
static constexpr std::array<uint8_t, 48> kPeepAnimationSequenceFunnelCakeWalking = { 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17 };
static constexpr std::array<uint8_t, 1> kPeepAnimationSequenceFunnelCakeWatchRide = { 0 };
static constexpr std::array<uint8_t, 12> kPeepAnimationSequenceFunnelCakeEatFood = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 };
static constexpr std::array<uint8_t, 1> kPeepAnimationSequenceFunnelCakeSittingIdle = { 0 };
@@ -939,7 +939,7 @@ namespace OpenRCT2
// Define animation group for FunnelCake sequences
static PeepAnimations kPeepAnimationsFunnelCake = []() {
PeepAnimations pag = kPeepAnimationsNormal;
pag[PeepAnimationType::None] = { kPeepSpriteFunnelCakeStateNoneId, kPeepAnimationSequenceFunnelCakeNone };
pag[PeepAnimationType::Walking] = { kPeepSpriteFunnelCakeStateWalkingId, kPeepAnimationSequenceFunnelCakeWalking };
pag[PeepAnimationType::WatchRide] = { kPeepSpriteFunnelCakeStateWatchRideId, kPeepAnimationSequenceFunnelCakeWatchRide };
pag[PeepAnimationType::EatFood] = { kPeepSpriteFunnelCakeStateWatchRideId, kPeepAnimationSequenceFunnelCakeEatFood };
pag[PeepAnimationType::SittingIdle] = { kPeepSpriteFunnelCakeStateSittingIdleId, kPeepAnimationSequenceFunnelCakeSittingIdle };
@@ -948,7 +948,7 @@ namespace OpenRCT2
}();
// Define animation sequences for Noodles sprites
static constexpr std::array<uint8_t, 48> kPeepAnimationSequenceNoodlesNone = { 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17 };
static constexpr std::array<uint8_t, 48> kPeepAnimationSequenceNoodlesWalking = { 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17 };
static constexpr std::array<uint8_t, 1> kPeepAnimationSequenceNoodlesWatchRide = { 0 };
static constexpr std::array<uint8_t, 12> kPeepAnimationSequenceNoodlesEatFood = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 };
static constexpr std::array<uint8_t, 1> kPeepAnimationSequenceNoodlesSittingIdle = { 0 };
@@ -957,7 +957,7 @@ namespace OpenRCT2
// Define animation group for Noodles sequences
static PeepAnimations kPeepAnimationsNoodles = []() {
PeepAnimations pag = kPeepAnimationsNormal;
pag[PeepAnimationType::None] = { kPeepSpriteNoodlesStateNoneId, kPeepAnimationSequenceNoodlesNone };
pag[PeepAnimationType::Walking] = { kPeepSpriteNoodlesStateWalkingId, kPeepAnimationSequenceNoodlesWalking };
pag[PeepAnimationType::WatchRide] = { kPeepSpriteNoodlesStateWatchRideId, kPeepAnimationSequenceNoodlesWatchRide };
pag[PeepAnimationType::EatFood] = { kPeepSpriteNoodlesStateWatchRideId, kPeepAnimationSequenceNoodlesEatFood };
pag[PeepAnimationType::SittingIdle] = { kPeepSpriteNoodlesStateSittingIdleId, kPeepAnimationSequenceNoodlesSittingIdle };
@@ -966,7 +966,7 @@ namespace OpenRCT2
}();
// Define animation sequences for Sausage sprites
static constexpr std::array<uint8_t, 48> kPeepAnimationSequenceSausageNone = { 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17 };
static constexpr std::array<uint8_t, 48> kPeepAnimationSequenceSausageWalking = { 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17 };
static constexpr std::array<uint8_t, 1> kPeepAnimationSequenceSausageWatchRide = { 0 };
static constexpr std::array<uint8_t, 12> kPeepAnimationSequenceSausageEatFood = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 };
static constexpr std::array<uint8_t, 1> kPeepAnimationSequenceSausageSittingIdle = { 0 };
@@ -975,7 +975,7 @@ namespace OpenRCT2
// Define animation group for Sausage sequences
static PeepAnimations kPeepAnimationsSausage = []() {
PeepAnimations pag = kPeepAnimationsNormal;
pag[PeepAnimationType::None] = { kPeepSpriteSausageStateNoneId, kPeepAnimationSequenceSausageNone };
pag[PeepAnimationType::Walking] = { kPeepSpriteSausageStateWalkingId, kPeepAnimationSequenceSausageWalking };
pag[PeepAnimationType::WatchRide] = { kPeepSpriteSausageStateWatchRideId, kPeepAnimationSequenceSausageWatchRide };
pag[PeepAnimationType::EatFood] = { kPeepSpriteSausageStateWatchRideId, kPeepAnimationSequenceSausageEatFood };
pag[PeepAnimationType::SittingIdle] = { kPeepSpriteSausageStateSittingIdleId, kPeepAnimationSequenceSausageSittingIdle };
@@ -984,7 +984,7 @@ namespace OpenRCT2
}();
// Define animation sequences for Soup sprites
static constexpr std::array<uint8_t, 48> kPeepAnimationSequenceSoupNone = { 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17 };
static constexpr std::array<uint8_t, 48> kPeepAnimationSequenceSoupWalking = { 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17 };
static constexpr std::array<uint8_t, 1> kPeepAnimationSequenceSoupWatchRide = { 0 };
static constexpr std::array<uint8_t, 12> kPeepAnimationSequenceSoupEatFood = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 };
static constexpr std::array<uint8_t, 1> kPeepAnimationSequenceSoupSittingIdle = { 0 };
@@ -993,7 +993,7 @@ namespace OpenRCT2
// Define animation group for Soup sequences
static PeepAnimations kPeepAnimationsSoup = []() {
PeepAnimations pag = kPeepAnimationsNormal;
pag[PeepAnimationType::None] = { kPeepSpriteSoupStateNoneId, kPeepAnimationSequenceSoupNone };
pag[PeepAnimationType::Walking] = { kPeepSpriteSoupStateWalkingId, kPeepAnimationSequenceSoupWalking };
pag[PeepAnimationType::WatchRide] = { kPeepSpriteSoupStateWatchRideId, kPeepAnimationSequenceSoupWatchRide };
pag[PeepAnimationType::EatFood] = { kPeepSpriteSoupStateWatchRideId, kPeepAnimationSequenceSoupEatFood };
pag[PeepAnimationType::SittingIdle] = { kPeepSpriteSoupStateSittingIdleId, kPeepAnimationSequenceSoupSittingIdle };
@@ -1002,7 +1002,7 @@ namespace OpenRCT2
}();
// Define animation sequences for Sandwich sprites
static constexpr std::array<uint8_t, 48> kPeepAnimationSequenceSandwichNone = { 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17 };
static constexpr std::array<uint8_t, 48> kPeepAnimationSequenceSandwichWalking = { 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17 };
static constexpr std::array<uint8_t, 1> kPeepAnimationSequenceSandwichWatchRide = { 0 };
static constexpr std::array<uint8_t, 12> kPeepAnimationSequenceSandwichEatFood = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 };
static constexpr std::array<uint8_t, 1> kPeepAnimationSequenceSandwichSittingIdle = { 0 };
@@ -1011,7 +1011,7 @@ namespace OpenRCT2
// Define animation group for Sandwich sequences
static PeepAnimations kPeepAnimationsSandwich = []() {
PeepAnimations pag = kPeepAnimationsNormal;
pag[PeepAnimationType::None] = { kPeepSpriteSandwichStateNoneId, kPeepAnimationSequenceSandwichNone };
pag[PeepAnimationType::Walking] = { kPeepSpriteSandwichStateWalkingId, kPeepAnimationSequenceSandwichWalking };
pag[PeepAnimationType::WatchRide] = { kPeepSpriteSandwichStateWatchRideId, kPeepAnimationSequenceSandwichWatchRide };
pag[PeepAnimationType::EatFood] = { kPeepSpriteSandwichStateWatchRideId, kPeepAnimationSequenceSandwichEatFood };
pag[PeepAnimationType::SittingIdle] = { kPeepSpriteSandwichStateSittingIdleId, kPeepAnimationSequenceSandwichSittingIdle };
@@ -1088,7 +1088,7 @@ namespace OpenRCT2
{
auto& group = kPeepAnimationEntries[groupKey];
for (auto type = EnumValue(PeepAnimationType::None); type <= EnumValue(PeepAnimationType::WithdrawMoney); type++)
for (auto type = EnumValue(PeepAnimationType::Walking); type <= EnumValue(PeepAnimationType::WithdrawMoney); type++)
{
auto& anim = group[PeepAnimationType(type)];
if (anim.frame_offsets.empty())

4
src/openrct2/peep/PeepAnimationData.h
View File

@@ -46,9 +46,9 @@ namespace OpenRCT2
};
const PeepAnimation& GetPeepAnimation(
PeepAnimationGroup spriteType, PeepAnimationType actionAnimationGroup = PeepAnimationType::None);
PeepAnimationGroup spriteType, PeepAnimationType actionAnimationGroup = PeepAnimationType::Walking);
const SpriteBounds& GetSpriteBounds(
PeepAnimationGroup spriteType, PeepAnimationType actionAnimationGroup = PeepAnimationType::None);
PeepAnimationGroup spriteType, PeepAnimationType actionAnimationGroup = PeepAnimationType::Walking);
void inferMaxPeepSpriteDimensions();
} // namespace OpenRCT2

94
src/openrct2/peep/PeepSpriteIds.h
View File

@@ -11,7 +11,7 @@ namespace OpenRCT2
{
enum
{
kPeepSpriteNormalStateNoneId = 6409,
kPeepSpriteNormalStateWalkingId = 6409,
kPeepSpriteNormalStateCheckTimeId = 6585,
kPeepSpriteNormalStateWatchRideId = 6621,
kPeepSpriteNormalStateEatFoodId = 6653,
@@ -38,7 +38,7 @@ namespace OpenRCT2
kPeepSpriteNormalStateBeingWatchedId = 7285,
kPeepSpriteNormalStateWithdrawMoneyId = 7181,
kHandymanSpriteStateNoneId = 11261,
kHandymanSpriteStateWalkingId = 11261,
kHandymanSpriteStateWatchRideId = 11285,
kHandymanSpriteStateHangingId = 11289,
kHandymanSpriteStateStaffMowerId = 11301,
@@ -47,7 +47,7 @@ namespace OpenRCT2
kHandymanSpriteStateStaffWateringId = 11377,
kHandymanSpriteStateStaffEmptyBinId = 11401,
kMechanicSpriteStateNoneId = 11441,
kMechanicSpriteStateWalkingId = 11441,
kMechanicSpriteStateWatchRideId = 11465,
kMechanicSpriteStateHangingId = 11469,
kMechanicSpriteStateDrowningId = 11481,
@@ -56,219 +56,219 @@ namespace OpenRCT2
kMechanicSpriteStateStaffFixId = 11669,
kMechanicSpriteStateStaffFixGroundId = 11801,
kSecuritySpriteStateNoneId = 11881,
kSecuritySpriteStateWalkingId = 11881,
kSecuritySpriteStateWatchRideId = 11905,
kSecuritySpriteStateHangingId = 11909,
kSecuritySpriteStateDrowningId = 11921,
kEntertainerSpritePandaStateNoneId = 11973,
kEntertainerSpritePandaStateWalkingId = 11973,
kEntertainerSpritePandaStateWatchRideId = 11997,
kEntertainerSpritePandaStateWaveId = 12041,
kEntertainerSpritePandaStateHangingId = 12001,
kEntertainerSpritePandaStateDrowningId = 12013,
kEntertainerSpritePandaStateJoyId = 12065,
kEntertainerSpriteTigerStateNoneId = 12129,
kEntertainerSpriteTigerStateWalkingId = 12129,
kEntertainerSpriteTigerStateWatchRideId = 12153,
kEntertainerSpriteTigerStateWaveId = 12197,
kEntertainerSpriteTigerStateHangingId = 12157,
kEntertainerSpriteTigerStateDrowningId = 12169,
kEntertainerSpriteTigerStateJoyId = 12221,
kEntertainerSpriteElephantStateNoneId = 12325,
kEntertainerSpriteElephantStateWalkingId = 12325,
kEntertainerSpriteElephantStateWatchRideId = 12349,
kEntertainerSpriteElephantStateWaveId = 12365,
kEntertainerSpriteElephantStateHangingId = 12353,
kEntertainerSpriteElephantStateDrowningId = 12393,
kEntertainerSpriteElephantStateJoyId = 12433,
kEntertainerSpriteRomanStateNoneId = 13897,
kEntertainerSpriteRomanStateWalkingId = 13897,
kEntertainerSpriteRomanStateWatchRideId = 13921,
kEntertainerSpriteRomanStateWaveId = 13937,
kEntertainerSpriteRomanStateHangingId = 13925,
kEntertainerSpriteRomanStateDrowningId = 13969,
kEntertainerSpriteRomanStateJoyId = 14029,
kEntertainerSpriteGorillaStateNoneId = 12549,
kEntertainerSpriteGorillaStateWalkingId = 12549,
kEntertainerSpriteGorillaStateWatchRideId = 12545,
kEntertainerSpriteGorillaStateWaveId = 12573,
kEntertainerSpriteGorillaStateHangingId = 12665,
kEntertainerSpriteGorillaStateDrowningId = 12617,
kEntertainerSpriteSnowmanStateNoneId = 12681,
kEntertainerSpriteSnowmanStateWalkingId = 12681,
kEntertainerSpriteSnowmanStateWatchRideId = 12677,
kEntertainerSpriteSnowmanStateWaveId = 12705,
kEntertainerSpriteSnowmanStateHangingId = 12881,
kEntertainerSpriteSnowmanStateDrowningId = 12841,
kEntertainerSpriteKnightStateNoneId = 12897,
kEntertainerSpriteKnightStateWalkingId = 12897,
kEntertainerSpriteKnightStateWatchRideId = 12893,
kEntertainerSpriteKnightStateWaveId = 12993,
kEntertainerSpriteKnightStateHangingId = 12981,
kEntertainerSpriteKnightStateDrowningId = 12921,
kEntertainerSpriteAstronautStateNoneId = 13769,
kEntertainerSpriteAstronautStateWalkingId = 13769,
kEntertainerSpriteAstronautStateWatchRideId = 13765,
kEntertainerSpriteAstronautStateWaveId = 13857,
kEntertainerSpriteAstronautStateHangingId = 13845,
kEntertainerSpriteAstronautStateDrowningId = 13793,
kEntertainerSpriteBanditStateNoneId = 13109,
kEntertainerSpriteBanditStateWalkingId = 13109,
kEntertainerSpriteBanditStateWatchRideId = 13105,
kEntertainerSpriteBanditStateWaveId = 13209,
kEntertainerSpriteBanditStateHangingId = 13197,
kEntertainerSpriteBanditStateDrowningId = 13133,
kEntertainerSpriteSheriffStateNoneId = 13613,
kEntertainerSpriteSheriffStateWalkingId = 13613,
kEntertainerSpriteSheriffStateWatchRideId = 13609,
kEntertainerSpriteSheriffStateWaveId = 13713,
kEntertainerSpriteSheriffStateHangingId = 13701,
kEntertainerSpriteSheriffStateDrowningId = 13637,
kEntertainerSpritePirateStateNoneId = 13381,
kEntertainerSpritePirateStateWalkingId = 13381,
kEntertainerSpritePirateStateWatchRideId = 13377,
kEntertainerSpritePirateStateWaveId = 13481,
kEntertainerSpritePirateStateHangingId = 13469,
kEntertainerSpritePirateStateDrowningId = 13405,
kPeepSpriteIceCreamStateNoneId = 7505,
kPeepSpriteIceCreamStateWalkingId = 7505,
kPeepSpriteIceCreamStateWatchRideId = 7501,
kPeepSpriteIceCreamStateEatFoodId = 7581,
kPeepSpriteIceCreamStateSittingIdleId = 7553,
kPeepSpriteIceCreamStateSittingEatFoodId = 7557,
kPeepSpriteChipsStateNoneId = 7609,
kPeepSpriteChipsStateWalkingId = 7609,
kPeepSpriteChipsStateWatchRideId = 7605,
kPeepSpriteChipsStateEatFoodId = 7733,
kPeepSpriteChipsStateSittingIdleId = 7681,
kPeepSpriteChipsStateSittingEatFoodId = 7685,
kPeepSpriteBurgerStateNoneId = 8385,
kPeepSpriteBurgerStateWalkingId = 8385,
kPeepSpriteBurgerStateWatchRideId = 8381,
kPeepSpriteBurgerStateEatFoodId = 8509,
kPeepSpriteBurgerStateSittingIdleId = 8457,
kPeepSpriteBurgerStateSittingEatFoodId = 8461,
kPeepSpriteDrinkStateNoneId = 8713,
kPeepSpriteDrinkStateWalkingId = 8713,
kPeepSpriteDrinkStateWatchRideId = 8709,
kPeepSpriteDrinkStateEatFoodId = 8837,
kPeepSpriteDrinkStateSittingIdleId = 8785,
kPeepSpriteDrinkStateSittingEatFoodId = 8789,
kPeepSpriteBalloonStateNoneId = 10785,
kPeepSpriteBalloonStateWalkingId = 10785,
kPeepSpriteBalloonStateWatchRideId = 10781,
kPeepSpriteBalloonStateSittingIdleId = 10809,
kPeepSpriteCandyflossStateNoneId = 10849,
kPeepSpriteCandyflossStateWalkingId = 10849,
kPeepSpriteCandyflossStateWatchRideId = 10845,
kPeepSpriteCandyflossStateEatFoodId = 10973,
kPeepSpriteCandyflossStateSittingIdleId = 10921,
kPeepSpriteCandyflossStateSittingEatFoodId = 10925,
kPeepSpriteUmbrellaStateNoneId = 11197,
kPeepSpriteUmbrellaStateWalkingId = 11197,
kPeepSpriteUmbrellaStateWatchRideId = 11221,
kPeepSpriteUmbrellaStateSittingIdleId = 11225,
kPeepSpritePizzaStateNoneId = 7785,
kPeepSpritePizzaStateWalkingId = 7785,
kPeepSpritePizzaStateWatchRideId = 7781,
kPeepSpritePizzaStateEatFoodId = 7861,
kPeepSpritePizzaStateSittingIdleId = 7833,
kPeepSpritePizzaStateSittingEatFoodId = 7837,
kSecurityStaffSpriteAltStateNoneId = 11949,
kSecurityStaffSpriteAltStateWalkingId = 11949,
kPeepSpritePopcornStateNoneId = 11025,
kPeepSpritePopcornStateWalkingId = 11025,
kPeepSpritePopcornStateWatchRideId = 11021,
kPeepSpritePopcornStateEatFoodId = 11149,
kPeepSpritePopcornStateSittingIdleId = 11097,
kPeepSpritePopcornStateSittingEatFoodId = 11101,
kPeepSpriteArmsCrossedStateNoneId = 6433,
kPeepSpriteArmsCrossedStateWalkingId = 6433,
kPeepSpriteHeadDownStateNoneId = 6457,
kPeepSpriteHeadDownStateWalkingId = 6457,
kPeepSpriteNauseousStateNoneId = 6481,
kPeepSpriteNauseousStateWalkingId = 6481,
kPeepSpriteVeryNauseousStateNoneId = 6505,
kPeepSpriteVeryNauseousStateWalkingId = 6505,
kPeepSpriteVeryNauseousStateWatchRideId = 6529,
kPeepSpriteVeryNauseousStateSittingIdleId = 6533,
kPeepSpriteRequireToiletStateNoneId = 6537,
kPeepSpriteRequireToiletStateWalkingId = 6537,
kPeepSpriteHatStateNoneId = 10721,
kPeepSpriteHatStateWalkingId = 10721,
kPeepSpriteHatStateWatchRideId = 10717,
kPeepSpriteHatStateSittingIdleId = 10745,
kPeepSpriteHotDogStateNoneId = 7889,
kPeepSpriteHotDogStateWalkingId = 7889,
kPeepSpriteHotDogStateWatchRideId = 7885,
kPeepSpriteHotDogStateEatFoodId = 8013,
kPeepSpriteHotDogStateSittingIdleId = 7961,
kPeepSpriteHotDogStateSittingEatFoodId = 7965,
kPeepSpriteTentacleStateNoneId = 8065,
kPeepSpriteTentacleStateWalkingId = 8065,
kPeepSpriteTentacleStateWatchRideId = 8061,
kPeepSpriteTentacleStateEatFoodId = 8285,
kPeepSpriteTentacleStateSittingIdleId = 8185,
kPeepSpriteTentacleStateSittingEatFoodId = 8189,
kPeepSpriteToffeeAppleStateNoneId = 7401,
kPeepSpriteToffeeAppleStateWalkingId = 7401,
kPeepSpriteToffeeAppleStateWatchRideId = 7397,
kPeepSpriteToffeeAppleStateEatFoodId = 7477,
kPeepSpriteToffeeAppleStateSittingIdleId = 7449,
kPeepSpriteToffeeAppleStateSittingEatFoodId = 7453,
kPeepSpriteDonutStateNoneId = 8561,
kPeepSpriteDonutStateWalkingId = 8561,
kPeepSpriteDonutStateWatchRideId = 8557,
kPeepSpriteDonutStateEatFoodId = 8661,
kPeepSpriteDonutStateSittingIdleId = 8633,
kPeepSpriteDonutStateSittingEatFoodId = 8637,
kPeepSpriteCoffeeStateNoneId = 8885,
kPeepSpriteCoffeeStateWalkingId = 8885,
kPeepSpriteCoffeeStateWatchRideId = 8981,
kPeepSpriteCoffeeStateSittingIdleId = 8957,
kPeepSpriteChickenStateNoneId = 9005,
kPeepSpriteChickenStateWalkingId = 9005,
kPeepSpriteChickenStateWatchRideId = 9125,
kPeepSpriteChickenStateSittingIdleId = 9077,
kPeepSpriteLemonadeStateNoneId = 9173,
kPeepSpriteLemonadeStateWalkingId = 9173,
kPeepSpriteLemonadeStateWatchRideId = 9293,
kPeepSpriteLemonadeStateSittingIdleId = 9245,
kPeepSpriteWatchingStateWatchRideId = 7245,
kPeepSpritePretzelStateNoneId = 9341,
kPeepSpritePretzelStateWalkingId = 9341,
kPeepSpritePretzelStateWatchRideId = 9461,
kPeepSpritePretzelStateSittingIdleId = 9413,
kPeepSpriteSunglassesStateNoneId = 10685,
kPeepSpriteSunglassesStateWalkingId = 10685,
kPeepSpriteSunglassesStateWatchRideId = 10713,
kPeepSpriteSunglassesStateSittingIdleId = 10709,
kPeepSpriteSuJongkwaStateNoneId = 9509,
kPeepSpriteSuJongkwaStateWalkingId = 9509,
kPeepSpriteSuJongkwaStateWatchRideId = 9629,
kPeepSpriteSuJongkwaStateSittingIdleId = 9581,
kPeepSpriteJuiceStateNoneId = 9677,
kPeepSpriteJuiceStateWalkingId = 9677,
kPeepSpriteJuiceStateWatchRideId = 9797,
kPeepSpriteJuiceStateSittingIdleId = 9749,
kPeepSpriteFunnelCakeStateNoneId = 9845,
kPeepSpriteFunnelCakeStateWalkingId = 9845,
kPeepSpriteFunnelCakeStateWatchRideId = 9965,
kPeepSpriteFunnelCakeStateSittingIdleId = 9917,
kPeepSpriteNoodlesStateNoneId = 10013,
kPeepSpriteNoodlesStateWalkingId = 10013,
kPeepSpriteNoodlesStateWatchRideId = 10133,
kPeepSpriteNoodlesStateSittingIdleId = 10085,
kPeepSpriteSausageStateNoneId = 10181,
kPeepSpriteSausageStateWalkingId = 10181,
kPeepSpriteSausageStateWatchRideId = 10301,
kPeepSpriteSausageStateSittingIdleId = 10253,
kPeepSpriteSoupStateNoneId = 10349,
kPeepSpriteSoupStateWalkingId = 10349,
kPeepSpriteSoupStateWatchRideId = 10469,
kPeepSpriteSoupStateSittingIdleId = 10421,
kPeepSpriteSandwichStateNoneId = 10517,
kPeepSpriteSandwichStateWalkingId = 10517,
kPeepSpriteSandwichStateWatchRideId = 10637,
kPeepSpriteSandwichStateSittingIdleId = 10589,
};

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

@@ -148,7 +148,7 @@ namespace OpenRCT2::Scripting
});
static const DukEnumMap<PeepAnimationType> availableGuestAnimations({
{ "walking", PeepAnimationType::None },
{ "walking", PeepAnimationType::Walking },
{ "checkTime", PeepAnimationType::CheckTime },
{ "watchRide", PeepAnimationType::WatchRide },
{ "eatFood", PeepAnimationType::EatFood },
@@ -921,7 +921,7 @@ namespace OpenRCT2::Scripting
// Special consideration for sitting peeps
// TODO: something funky going on in the state machine
if (peep->AnimationType == PeepAnimationType::None && peep->State == PeepState::Sitting)
if (peep->AnimationType == PeepAnimationType::Walking && peep->State == PeepState::Sitting)
action = availableGuestAnimations[PeepAnimationType::SittingIdle];
return std::string(action);

10
src/openrct2/scripting/bindings/entity/ScStaff.cpp
View File

@@ -18,7 +18,7 @@
namespace OpenRCT2::Scripting
{
static const DukEnumMap<PeepAnimationType> availableHandymanAnimations({
{ "walking", PeepAnimationType::None },
{ "walking", PeepAnimationType::Walking },
{ "watchRide", PeepAnimationType::WatchRide },
{ "hanging", PeepAnimationType::Hanging },
{ "staffMower", PeepAnimationType::StaffMower },
@@ -29,7 +29,7 @@ namespace OpenRCT2::Scripting
});
static const DukEnumMap<PeepAnimationType> availableMechanicAnimations({
{ "walking", PeepAnimationType::None },
{ "walking", PeepAnimationType::Walking },
{ "watchRide", PeepAnimationType::WatchRide },
{ "hanging", PeepAnimationType::Hanging },
{ "drowning", PeepAnimationType::Drowning },
@@ -43,14 +43,14 @@ namespace OpenRCT2::Scripting
});
static const DukEnumMap<PeepAnimationType> availableSecurityAnimations({
{ "walking", PeepAnimationType::None },
{ "walking", PeepAnimationType::Walking },
{ "watchRide", PeepAnimationType::WatchRide },
{ "hanging", PeepAnimationType::Hanging },
{ "drowning", PeepAnimationType::Drowning },
});
static const DukEnumMap<PeepAnimationType> availableEntertainerAnimations({
{ "walking", PeepAnimationType::None },
{ "walking", PeepAnimationType::Walking },
{ "watchRide", PeepAnimationType::WatchRide },
{ "wave", PeepAnimationType::EatFood }, // NB: this not a typo
{ "hanging", PeepAnimationType::Hanging },
@@ -136,7 +136,7 @@ namespace OpenRCT2::Scripting
// Reset state to walking to prevent invalid actions from carrying over
peep->Action = PeepActionType::Walking;
peep->AnimationType = peep->NextAnimationType = PeepAnimationType::None;
peep->AnimationType = peep->NextAnimationType = PeepAnimationType::Walking;
}
}