diff --git a/deploy/DATA/sfx/list.ods b/deploy/DATA/sfx/list.ods index c559038..d03656f 100644 Binary files a/deploy/DATA/sfx/list.ods and b/deploy/DATA/sfx/list.ods differ diff --git a/src/headers/common.h b/src/headers/common.h index 27573db..10f35d5 100644 --- a/src/headers/common.h +++ b/src/headers/common.h @@ -298,8 +298,9 @@ public: #define GUY_RESULT_S pickRandomInt(2, 100, 101) #define GUY_RESULT_B pickRandomInt(2, 97, 104) -#define GUY_RESULT_C pickRandomInt(2, 103, 108) -#define GUY_RESULT_D pickRandomInt(2, 91, 95) +#define GUY_RESULT_C pickRandomInt(2, 123, 133) +#define GUY_RESULT_D pickRandomInt(2, 88, 108) +#define GUY_RESULT_E pickRandomInt(2, 91, 95) #define GUY_EARN_EXTRA pickRandomInt(2, 115, 85) // one more time, made just for you, #define GUY_EARN_SPECIAL_EXTRA pickRandomInt(2, 82, 81) // wow youre a real dancer, can you do this, diff --git a/src/source/gameplayMode.cpp b/src/source/gameplayMode.cpp index 48e4228..5659dd0 100644 --- a/src/source/gameplayMode.cpp +++ b/src/source/gameplayMode.cpp @@ -183,6 +183,7 @@ void firstGameplayLoop() announcerMinusPoints = 0; announcerLastCheckTotal = 0; announcerTargetSpeak = 0; + // load certain sound effects only during the first run of the game if ( !gameplayInitialized ) @@ -336,7 +337,7 @@ void mainGameplayLoop(UTIME dt) // index 0 and 2 are "long", index 1 and 3 are "short" static int GUY_PLAYING_PERFECT[4] = { 107, 132, 99, 140 }; static int GUY_PLAYING_GREAT[4] = { 65, 117, 98, 119 }; - static int GUY_PLAYING_UNWELL[4] = { 102, 144, 111, 146 }; + static int GUY_PLAYING_UNWELL[4] = { 116, 144, 111, 146 }; static int GUY_PLAYING_GIVEUP[4] = { 93, 127, 94, 128 }; bool talked = false; diff --git a/src/source/resultsMode.cpp b/src/source/resultsMode.cpp index b5b6917..e77a13b 100644 --- a/src/source/resultsMode.cpp +++ b/src/source/resultsMode.cpp @@ -132,7 +132,7 @@ void mainResultsLoop(UTIME dt) averageScore /= numStages; } - if ( averageScore >= 950000 ) + if ( averageScore >= 900000 ) { em.announcerQuip(GUY_RESULT_S); } @@ -144,10 +144,14 @@ void mainResultsLoop(UTIME dt) { em.announcerQuip(GUY_RESULT_C); } - else if ( averageScore > 0 ) + else if ( averageScore > 400000 ) { em.announcerQuip(GUY_RESULT_D); } + else + { + em.announcerQuip(GUY_RESULT_E); + } } if ( !doneIntroAnim && resultFadeTimer < (INTRO_ANIM_LENGTH/2) ) {