adds new audio files and updates durations
This commit is contained in:
parent
0ba199a777
commit
47195d9445
30 changed files with 76 additions and 57 deletions
BIN
assets/0001WaitingForGameStart.mp3
(Stored with Git LFS)
BIN
assets/0001WaitingForGameStart.mp3
(Stored with Git LFS)
Binary file not shown.
BIN
assets/0002AfterMainstation.mp3
(Stored with Git LFS)
Normal file
BIN
assets/0002AfterMainstation.mp3
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/0002OnTheMoveMainStation.mp3
(Stored with Git LFS)
BIN
assets/0002OnTheMoveMainStation.mp3
(Stored with Git LFS)
Binary file not shown.
BIN
assets/0003HackingStationMuhvella.mp3
(Stored with Git LFS)
Normal file
BIN
assets/0003HackingStationMuhvella.mp3
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/0003StationOneCorrect.mp3
(Stored with Git LFS)
BIN
assets/0003StationOneCorrect.mp3
(Stored with Git LFS)
Binary file not shown.
BIN
assets/0004PickupStationMuhvella.mp3
(Stored with Git LFS)
Normal file
BIN
assets/0004PickupStationMuhvella.mp3
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/0004StationTwoCorrekt.mp3
(Stored with Git LFS)
BIN
assets/0004StationTwoCorrekt.mp3
(Stored with Git LFS)
Binary file not shown.
BIN
assets/0005AfterStationMuhvella.mp3
(Stored with Git LFS)
Normal file
BIN
assets/0005AfterStationMuhvella.mp3
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/0005StationTreeCorrekt.mp3
(Stored with Git LFS)
BIN
assets/0005StationTreeCorrekt.mp3
(Stored with Git LFS)
Binary file not shown.
BIN
assets/0006HackingStationMagie.mp3
(Stored with Git LFS)
Normal file
BIN
assets/0006HackingStationMagie.mp3
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/0006StationFourCorrekt.mp3
(Stored with Git LFS)
BIN
assets/0006StationFourCorrekt.mp3
(Stored with Git LFS)
Binary file not shown.
BIN
assets/0007PickupStationMagie.mp3
(Stored with Git LFS)
Normal file
BIN
assets/0007PickupStationMagie.mp3
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/0007WrongStation.mp3
(Stored with Git LFS)
BIN
assets/0007WrongStation.mp3
(Stored with Git LFS)
Binary file not shown.
BIN
assets/0008AfterSationMagie.mp3
(Stored with Git LFS)
Normal file
BIN
assets/0008AfterSationMagie.mp3
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/0008Ende.mp3
(Stored with Git LFS)
BIN
assets/0008Ende.mp3
(Stored with Git LFS)
Binary file not shown.
BIN
assets/0009HackingStationBicola.mp3
(Stored with Git LFS)
Normal file
BIN
assets/0009HackingStationBicola.mp3
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/0009Stress.mp3
(Stored with Git LFS)
BIN
assets/0009Stress.mp3
(Stored with Git LFS)
Binary file not shown.
BIN
assets/0010PickupStationBicola.mp3
(Stored with Git LFS)
Normal file
BIN
assets/0010PickupStationBicola.mp3
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/0010StationTwoPickUp-240528_1353.mp3
(Stored with Git LFS)
BIN
assets/0010StationTwoPickUp-240528_1353.mp3
(Stored with Git LFS)
Binary file not shown.
BIN
assets/0011AfterStationBicola.mp3
(Stored with Git LFS)
Normal file
BIN
assets/0011AfterStationBicola.mp3
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/0011StationTreePickup-240528_1354.mp3
(Stored with Git LFS)
BIN
assets/0011StationTreePickup-240528_1354.mp3
(Stored with Git LFS)
Binary file not shown.
BIN
assets/0012HackingStationTobione.mp3
(Stored with Git LFS)
Normal file
BIN
assets/0012HackingStationTobione.mp3
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/0012StationFourPickUp-240528_1357.mp3
(Stored with Git LFS)
BIN
assets/0012StationFourPickUp-240528_1357.mp3
(Stored with Git LFS)
Binary file not shown.
BIN
assets/0013PickupStationTobione.mp3
(Stored with Git LFS)
Normal file
BIN
assets/0013PickupStationTobione.mp3
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/0014AfterTobione.mp3
(Stored with Git LFS)
Normal file
BIN
assets/0014AfterTobione.mp3
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/0015End.mp3
(Stored with Git LFS)
Normal file
BIN
assets/0015End.mp3
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
assets/0016WrongStation.mp3
(Stored with Git LFS)
Normal file
BIN
assets/0016WrongStation.mp3
(Stored with Git LFS)
Normal file
Binary file not shown.
26
src/sounds.h
26
src/sounds.h
|
@ -5,22 +5,20 @@
|
||||||
#define AFTER_MAIN_STATION 2
|
#define AFTER_MAIN_STATION 2
|
||||||
|
|
||||||
#define HACKING_STATION_MUHVELLA 3
|
#define HACKING_STATION_MUHVELLA 3
|
||||||
#define PICKUP_STATION_MUHVELLA 10
|
#define PICKUP_STATION_MUHVELLA 4
|
||||||
#define AFTER_MUHVELLA 10 // incorrect
|
#define AFTER_MUHVELLA 5
|
||||||
|
|
||||||
#define HACKING_STATION_MAGIE 4
|
#define HACKING_STATION_MAGIE 6
|
||||||
#define PICKUP_STATION_MAGIE 11
|
#define PICKUP_STATION_MAGIE 7
|
||||||
#define AFTER_MAGIE 11 // incorrect
|
#define AFTER_MAGIE 8
|
||||||
|
|
||||||
#define HACKING_STATION_BICOLA 5
|
#define HACKING_STATION_BICOLA 9
|
||||||
#define PICKUP_STATION_BICOLA 12
|
#define PICKUP_STATION_BICOLA 10
|
||||||
#define AFTER_BICOLA 12 // incorrect
|
#define AFTER_BICOLA 11
|
||||||
|
|
||||||
#define HACKING_STATION_TOBIONE 6
|
#define HACKING_STATION_TOBIONE 12
|
||||||
#define PICKUP_STATION_TOBIONE 13
|
#define PICKUP_STATION_TOBIONE 13
|
||||||
#define AFTER_TOBIONE 13 // incorrect
|
#define AFTER_TOBIONE 14
|
||||||
|
|
||||||
#define END 8
|
#define END 15
|
||||||
#define WRONG_STATION 7
|
#define WRONG_STATION 16
|
||||||
|
|
||||||
#define STRESS 9
|
|
||||||
|
|
|
@ -184,22 +184,22 @@ void Hacking::activated(const Context context)
|
||||||
auto currentStationIndex = context.getStationIndex(this->currentStation);
|
auto currentStationIndex = context.getStationIndex(this->currentStation);
|
||||||
if (currentStationIndex == 1)
|
if (currentStationIndex == 1)
|
||||||
{
|
{
|
||||||
timer = Timer(31000, false);
|
timer = Timer(25000, false);
|
||||||
context.dfPlayer->play(HACKING_STATION_MUHVELLA);
|
context.dfPlayer->play(HACKING_STATION_MUHVELLA);
|
||||||
}
|
}
|
||||||
if (currentStationIndex == 2)
|
if (currentStationIndex == 2)
|
||||||
{
|
{
|
||||||
timer = Timer(33000, false);
|
timer = Timer(29000, false);
|
||||||
context.dfPlayer->play(HACKING_STATION_MAGIE);
|
context.dfPlayer->play(HACKING_STATION_MAGIE);
|
||||||
}
|
}
|
||||||
if (currentStationIndex == 3)
|
if (currentStationIndex == 3)
|
||||||
{
|
{
|
||||||
timer = Timer(36000, false);
|
timer = Timer(29000, false);
|
||||||
context.dfPlayer->play(HACKING_STATION_BICOLA);
|
context.dfPlayer->play(HACKING_STATION_BICOLA);
|
||||||
}
|
}
|
||||||
if (currentStationIndex == 4)
|
if (currentStationIndex == 4)
|
||||||
{
|
{
|
||||||
timer = Timer(35000, false);
|
timer = Timer(39000, false);
|
||||||
context.dfPlayer->play(HACKING_STATION_TOBIONE);
|
context.dfPlayer->play(HACKING_STATION_TOBIONE);
|
||||||
}
|
}
|
||||||
timer.start();
|
timer.start();
|
||||||
|
@ -287,17 +287,23 @@ void WaitingForPickup::activated(Context context)
|
||||||
//------------------------------------
|
//------------------------------------
|
||||||
|
|
||||||
|
|
||||||
End::End() = default;
|
End::End(): timer(Timer(0, false))
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
State* End::pickedUp(const Context context)
|
State* End::pickedUp(const Context context)
|
||||||
{
|
{
|
||||||
// todo what happens when we pick up here?...
|
// todo to be discussed if this is the expected outcome...
|
||||||
return this;
|
return new OnTheMove(context.stations + 1); // starting game early
|
||||||
}
|
}
|
||||||
|
|
||||||
State* End::update(const Context context)
|
State* End::update(const Context context)
|
||||||
{
|
{
|
||||||
// todo after some time return waiting for game start...
|
bool done = timer.update(context.delta);
|
||||||
|
if (done)
|
||||||
|
{
|
||||||
|
return new WaitingForGameStart();
|
||||||
|
}
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -309,4 +315,5 @@ String End::updateDisplay()
|
||||||
void End::activated(const Context context)
|
void End::activated(const Context context)
|
||||||
{
|
{
|
||||||
context.dfPlayer->play(END);
|
context.dfPlayer->play(END);
|
||||||
|
timer = Timer(27000, false);
|
||||||
}
|
}
|
||||||
|
|
|
@ -97,6 +97,8 @@ public:
|
||||||
|
|
||||||
class End final : public State
|
class End final : public State
|
||||||
{
|
{
|
||||||
|
protected:
|
||||||
|
Timer timer;
|
||||||
public:
|
public:
|
||||||
End();
|
End();
|
||||||
State* pickedUp(Context context) override;
|
State* pickedUp(Context context) override;
|
||||||
|
|
Loading…
Reference in a new issue