edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-19 06:28:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8406 from l-ouis/master

Browse source 
Add confetti particles on finish
This commit is contained in:
Dennis Felsing 2024-06-02 11:15:16 +00:00 committed by GitHub
parent bbf54ec625 9492ca574b
commit bcc7412847
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 80 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
datasrc/network.py
View file

@ -1,7 +1,7 @@
# pylint: skip-file
# See https://github.com/ddnet/ddnet/issues/3507
from datatypes import Enum, Flags, NetArray, NetBool, NetEvent, NetIntAny, NetIntRange, NetMessage, NetMessageEx, NetObject, NetObjectEx, NetString, NetStringHalfStrict, NetStringStrict, NetTick
from datatypes import Enum, Flags, NetArray, NetBool, NetEvent, NetEventEx, NetIntAny, NetIntRange, NetMessage, NetMessageEx, NetObject, NetObjectEx, NetString, NetStringHalfStrict, NetStringStrict, NetTick
Emotes = ["NORMAL", "PAIN", "HAPPY", "SURPRISE", "ANGRY", "BLINK"]
PlayerFlags = ["PLAYING", "IN_MENU", "CHATTING", "SCOREBOARD", "AIM"]
@ -328,6 +328,7 @@ Objects = [
NetEvent("Spawn:Common", []),
NetEvent("HammerHit:Common", []),
NetEvent("Death:Common", [
NetIntRange("m_ClientId", 0, 'MAX_CLIENTS-1'),
]),
@ -344,6 +345,8 @@ Objects = [
NetIntAny("m_Angle"),
]),
NetEventEx("Finish:Common", "finish@netevent.ddnet.org", []),
NetObjectEx("MyOwnEvent", "my-own-event@heinrich5991.de", [
NetIntAny("m_Test"),
]),

54
src/game/client/components/effects.cpp
View file

@ -231,6 +231,60 @@ void CEffects::PlayerDeath(vec2 Pos, int ClientId, float Alpha)
}
}
void CEffects::FinishConfetti(vec2 Pos, float Alpha)
{
ColorRGBA Red(1.0f, 0.4f, 0.4f);
ColorRGBA Green(0.4f, 1.0f, 0.4f);
ColorRGBA Blue(0.4f, 0.4f, 1.0f);
ColorRGBA Yellow(1.0f, 1.0f, 0.4f);
ColorRGBA Cyan(0.4f, 1.0f, 1.0f);
ColorRGBA Magenta(1.0f, 0.4f, 1.0f);
ColorRGBA aConfettiColors[] = {Red, Green, Blue, Yellow, Cyan, Magenta};
// powerful confettis
for(int i = 0; i < 32; i++)
{
CParticle p;
p.SetDefault();
p.m_Spr = SPRITE_PART_SPLAT01 + (rand() % 3);
p.m_Pos = Pos;
p.m_Vel = direction(-0.5f * pi + random_float(-0.2f, 0.2f)) * random_float(0.01f, 1.0f) * 2000.0f;
p.m_LifeSpan = random_float(1.0f, 1.2f);
p.m_StartSize = random_float(12.0f, 24.0f);
p.m_EndSize = 0;
p.m_Rot = random_angle();
p.m_Rotspeed = random_float(-0.5f, 0.5f) * pi;
p.m_Gravity = -700.0f;
p.m_Friction = 0.6f;
ColorRGBA c = aConfettiColors[(rand() % std::size(aConfettiColors))];
p.m_Color = c.WithMultipliedAlpha(0.75f * Alpha);
p.m_StartAlpha = Alpha;
m_pClient->m_Particles.Add(CParticles::GROUP_GENERAL, &p);
}
// broader confettis
for(int i = 0; i < 32; i++)
{
CParticle p;
p.SetDefault();
p.m_Spr = SPRITE_PART_SPLAT01 + (rand() % 3);
p.m_Pos = Pos;
p.m_Vel = direction(-0.5f * pi + random_float(-0.8f, 0.8f)) * random_float(0.01f, 1.0f) * 1500.0f;
p.m_LifeSpan = random_float(0.8f, 1.0f);
p.m_StartSize = random_float(12.0f, 24.0f);
p.m_EndSize = 0;
p.m_Rot = random_angle();
p.m_Rotspeed = random_float(-0.5f, 0.5f) * pi;
p.m_Gravity = -700.0f;
p.m_Friction = 0.6f;
ColorRGBA c = aConfettiColors[(rand() % std::size(aConfettiColors))];
p.m_Color = c.WithMultipliedAlpha(0.75f * Alpha);
p.m_StartAlpha = Alpha;
m_pClient->m_Particles.Add(CParticles::GROUP_GENERAL, &p);
}
}
void CEffects::Explosion(vec2 Pos, float Alpha)
{
// add to flow

1
src/game/client/components/effects.h
View file

@ -31,6 +31,7 @@ public:
void PlayerDeath(vec2 Pos, int ClientId, float Alpha = 1.0f);
void PowerupShine(vec2 Pos, vec2 Size, float Alpha = 1.0f);
void FreezingFlakes(vec2 Pos, vec2 Size, float Alpha = 1.0f);
void FinishConfetti(vec2 Pos, float Alpha = 1.0f);
void Update();
};

5
src/game/client/gameclient.cpp
View file

@ -1140,6 +1140,11 @@ void CGameClient::ProcessEvents()
CNetEvent_HammerHit *pEvent = (CNetEvent_HammerHit *)pData;
m_Effects.HammerHit(vec2(pEvent->m_X, pEvent->m_Y), Alpha);
}
else if(Item.m_Type == NETEVENTTYPE_FINISH)
{
CNetEvent_Finish *pEvent = (CNetEvent_Finish *)pData;
m_Effects.FinishConfetti(vec2(pEvent->m_X, pEvent->m_Y), Alpha);
}
else if(Item.m_Type == NETEVENTTYPE_SPAWN)
{
CNetEvent_Spawn *pEvent = (CNetEvent_Spawn *)pData;

11
src/game/server/gamecontext.cpp
View file

@ -347,6 +347,17 @@ void CGameContext::CreateDeath(vec2 Pos, int ClientId, CClientMask Mask)
}
}
void CGameContext::CreateFinishConfetti(vec2 Pos, CClientMask Mask)
{
// create the event
CNetEvent_Finish *pEvent = m_Events.Create<CNetEvent_Finish>(Mask);
if(pEvent)
{
pEvent->m_X = (int)Pos.x;
pEvent->m_Y = (int)Pos.y;
}
}
void CGameContext::CreateSound(vec2 Pos, int Sound, CClientMask Mask)
{
if(Sound < 0)

1
src/game/server/gamecontext.h
View file

@ -239,6 +239,7 @@ public:
void CreateHammerHit(vec2 Pos, CClientMask Mask = CClientMask().set());
void CreatePlayerSpawn(vec2 Pos, CClientMask Mask = CClientMask().set());
void CreateDeath(vec2 Pos, int ClientId, CClientMask Mask = CClientMask().set());
void CreateFinishConfetti(vec2 Pos, CClientMask Mask = CClientMask().set());
void CreateSound(vec2 Pos, int Sound, CClientMask Mask = CClientMask().set());
void CreateSoundGlobal(int Sound, int Target = -1) const;

4
src/game/server/teams.cpp
View file

@ -848,6 +848,10 @@ void CGameTeams::OnFinish(CPlayer *Player, int TimeTicks, const char *pTimestamp
{
Player->m_Score = TTime;
}
// Confetti
CCharacter *pChar = Player->GetCharacter();
m_pGameContext->CreateFinishConfetti(pChar->m_Pos, pChar->TeamMask());
}
void CGameTeams::RequestTeamSwap(CPlayer *pPlayer, CPlayer *pTargetPlayer, int Team)