games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-11-28 08:48:48 +02:00
Code Issues Releases Activity

Add sound notification for timer

Browse Source
This commit is contained in:
nordsoft 2023-08-17 01:10:03 +04:00
parent d26fdaefe4
commit 647c7c15a3
5 changed files with 36 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Mods/vcmi/Sounds/we5.wav Normal file
View File

Binary file not shown.

4
Mods/vcmi/mod.json
View File

@ -190,6 +190,10 @@
"MAPS/":
[
{"type" : "dir", "path" : "/Maps"}
],
"SOUNDS/":
[
{"type" : "dir", "path" : "/Sounds"}
]
}
}

41
client/adventureMap/TurnTimerWidget.cpp
View File

@ -10,6 +10,8 @@
#include "StdInc.h"
#include "TurnTimerWidget.h"
#include "../CGameInfo.h"
#include "../CMusicHandler.h"
#include "../CPlayerInterface.h"
#include "../render/EFont.h"
@ -44,6 +46,11 @@ TurnTimerWidget::TurnTimerWidget():
const JsonNode config(ResourceID("config/widgets/turnTimer.json"));
build(config);
std::transform(variables["notificationTime"].Vector().begin(),
variables["notificationTime"].Vector().end(),
std::inserter(notifications, notifications.begin()),
[](const JsonNode & node){ return node.Integer(); });
}
std::shared_ptr<TurnTimerWidget::DrawRect> TurnTimerWidget::buildDrawRect(const JsonNode & config) const
@ -61,7 +68,10 @@ void TurnTimerWidget::show(Canvas & to)
void TurnTimerWidget::setTime(int time)
{
turnTime = time / 1000;
int newTime = time / 1000;
if((newTime != turnTime) && notifications.count(newTime))
CCS->soundh->playSound(variables["notificationSound"].String());
turnTime = newTime;
if(auto w = widget<CLabel>("timer"))
{
std::ostringstream oss;
@ -79,28 +89,25 @@ void TurnTimerWidget::tick(uint32_t msPassed)
cachedTurnTime -= msPassed;
if(cachedTurnTime < 0) cachedTurnTime = 0; //do not go below zero
auto timeCheckAndUpdate = [&](int time)
{
if(time / 1000 != lastTurnTime / 1000)
{
//do not update timer on this tick
lastTurnTime = time;
cachedTurnTime = time;
}
else setTime(cachedTurnTime);
};
if(LOCPLINT->battleInt)
{
if(time.isBattleEnabled())
{
if(time.creatureTimer / 1000 != lastTurnTime / 1000)
{
//do not update timer on this tick
lastTurnTime = time.creatureTimer;
cachedTurnTime = time.creatureTimer;
}
else setTime(cachedTurnTime);
}
timeCheckAndUpdate(time.creatureTimer);
}
else
{
if(time.turnTimer / 1000 != lastTurnTime / 1000)
{
//do not update timer on this tick
lastTurnTime = time.turnTimer;
cachedTurnTime = time.turnTimer;
}
else setTime(cachedTurnTime);
timeCheckAndUpdate(time.turnTimer);
}
}
}

4
client/adventureMap/TurnTimerWidget.h
View File

@ -36,14 +36,12 @@ private:
int lastTurnTime;
int cachedTurnTime;
//std::shared_ptr<CAnimImage> watches;
//std::shared_ptr<CLabel> label;
std::set<int> notifications;
std::shared_ptr<DrawRect> buildDrawRect(const JsonNode & config) const;
public:
//void tick(uint32_t msPassed) override;
void show(Canvas & to) override;
void tick(uint32_t msPassed) override;

8
config/widgets/turnTimer.json
View File

@ -23,5 +23,11 @@
"text": "",
"position": {"x": 24, "y": 2}
},
]
],
"variables":
{
"notificationTime": [0, 1, 2, 3, 4, 5, 20],
"notificationSound": "WE5"
}
}