icedream
/
hide-and-seek
1
0
Fork 0
Code Issues Pull Requests Releases 3 Wiki Activity

Use "lower message" for the prerelease timer for hiders.

master
Icedream 2016-04-08 18:12:22 +02:00
parent 179f6fea3f
commit da5734393d
4 changed files with 20 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
english/localizedstrings/hns.str
View File

@ -17,9 +17,6 @@ REFERENCE OBJECTIVES_HIDEANDSEEK_DEFENDER
LANG_ENGLISH "Disguise yourself and survive." LANG_ENGLISH "Disguise yourself and survive."
REFERENCE HIDEANDSEEK_TIMER_SEEKER_RELEASE REFERENCE HIDEANDSEEK_TIMER_SEEKER_RELEASE
LANG_ENGLISH "Seekers released in &&1"
REFERENCE HIDEANDSEEK_TIMER_SEEKER_RELEASE_TITLE
LANG_ENGLISH "Seekers will be released in:" LANG_ENGLISH "Seekers will be released in:"
REFERENCE HIDEANDSEEK_SEEKERS_RELEASED REFERENCE HIDEANDSEEK_SEEKERS_RELEASED

3
german/localizedstrings/hns.str
View File

@ -17,9 +17,6 @@ REFERENCE OBJECTIVES_HIDEANDSEEK_DEFENDER
LANG_GERMAN "Tarne dich and überlebe." LANG_GERMAN "Tarne dich and überlebe."
REFERENCE HIDEANDSEEK_TIMER_SEEKER_RELEASE REFERENCE HIDEANDSEEK_TIMER_SEEKER_RELEASE
LANG_GERMAN "Seeker kommen in &&1"
REFERENCE HIDEANDSEEK_TIMER_SEEKER_RELEASE_TITLE
LANG_GERMAN "Seeker werden freigelassen in:" LANG_GERMAN "Seeker werden freigelassen in:"
REFERENCE HIDEANDSEEK_SEEKERS_RELEASED REFERENCE HIDEANDSEEK_SEEKERS_RELEASED

37
maps/mp/gametypes/hns.gsc
View File

@ -177,7 +177,6 @@ onPrecacheGametype()
game["fx_boom"] = LoadFX("props/electricbox4_explode"); game["fx_boom"] = LoadFX("props/electricbox4_explode");
PreCacheString(&"HIDEANDSEEK_TIMER_SEEKER_RELEASE"); PreCacheString(&"HIDEANDSEEK_TIMER_SEEKER_RELEASE");
PreCacheString(&"HIDEANDSEEK_TIMER_SEEKER_RELEASE_TITLE");
PreCacheString(&"HIDEANDSEEK_SEEKERS_RELEASED"); PreCacheString(&"HIDEANDSEEK_SEEKERS_RELEASED");
PreCacheString(&"OBJECTIVES_HIDEANDSEEK_DEFENDER"); PreCacheString(&"OBJECTIVES_HIDEANDSEEK_DEFENDER");
@ -475,9 +474,14 @@ levelReleaseTimer()
{ {
logString("levelReleaseTimer called"); logString("levelReleaseTimer called");
gameFlagClear("seekers_prerelease_setup");
gameFlagClear("seekers_released"); gameFlagClear("seekers_released");
gameFlagWait("prematch_done"); gameFlagWait("prematch_done");
level.preReleaseStart = getTime();
gameFlagSet("seekers_prerelease_setup");
if (!level.preReleaseTime) if (!level.preReleaseTime)
{ {
gameFlagSet("seekers_released"); gameFlagSet("seekers_released");
@ -488,24 +492,16 @@ levelReleaseTimer()
timerDisplays = []; timerDisplays = [];
// Display a pre-release timer on the top right corner for the hiders // Pre-release timer for hiders now handled in handleHider function!
timerDisplay = createServerTimer("objective", 1.4, game["hiders"]);
timerDisplay setPoint("TOPRIGHT", "TOPRIGHT", -8, 8);
timerDisplay.archived = false;
timerDisplay.hideWhenInMenu = false;
timerDisplay.label = &"HIDEANDSEEK_TIMER_SEEKER_RELEASE";
timerDisplay.alpha = 1;
timerDisplay setTimer(level.preReleaseTime);
timerDisplays[0] = timerDisplay;
// Display a pre-release timer in the center for the seekers // Display a pre-release timer in the center for the seekers
timerDisplayText = createServerFontString("objective", 1.5, game["seekers"]); timerDisplayText = createServerFontString("objective", 1.5, game["seekers"]);
timerDisplayText setPoint("CENTER", "CENTER", 0, -40); timerDisplayText setPoint("CENTER", "CENTER", 0, -40);
timerDisplayText.sort = 1001; timerDisplayText.sort = 1001;
timerDisplayText setText(&"HIDEANDSEEK_TIMER_SEEKER_RELEASE_TITLE"); timerDisplayText setText(&"HIDEANDSEEK_TIMER_SEEKER_RELEASE");
timerDisplayText.foreground = false; timerDisplayText.foreground = false;
timerDisplayText.hideWhenInMenu = true; timerDisplayText.hideWhenInMenu = true;
timerDisplays[1] = timerDisplayText; timerDisplays[timerDisplays.size] = timerDisplayText;
timerDisplay = createServerTimer("hudbig", 1, game["seekers"]); timerDisplay = createServerTimer("hudbig", 1, game["seekers"]);
timerDisplay setPoint("CENTER", "CENTER", 0, 0); timerDisplay setPoint("CENTER", "CENTER", 0, 0);
timerDisplay.sort = 1001; timerDisplay.sort = 1001;
@ -514,16 +510,16 @@ levelReleaseTimer()
timerDisplay.hideWhenInMenu = true; timerDisplay.hideWhenInMenu = true;
timerDisplay maps\mp\gametypes\_hud::fontPulseInit(); timerDisplay maps\mp\gametypes\_hud::fontPulseInit();
//timerDisplay setTimer(level.preReleaseTime); //timerDisplay setTimer(level.preReleaseTime);
timerDisplays[2] = timerDisplay; timerDisplays[timerDisplays.size] = timerDisplay;
waittillframeend; // wait till cleanup of previous start timer if multiple happen at once waittillframeend; // wait till cleanup of previous start timer if multiple happen at once
timerSeconds = level.preReleaseTime; timerSeconds = level.preReleaseTime;
for (timerSeconds = level.preReleaseTime; timerSeconds > 0 && !level.gameEnded; timerSeconds--) for (timerSeconds = level.preReleaseTime; timerSeconds > 0 && !level.gameEnded; timerSeconds--)
{ {
timerDisplays[2] thread maps\mp\gametypes\_hud::fontPulse(level); timerDisplays[timerDisplays.size - 1] thread maps\mp\gametypes\_hud::fontPulse(level);
wait (timerDisplays[2].inFrames * 0.05); wait (timerDisplays[timerDisplays.size - 1].inFrames * 0.05);
timerDisplays[2] SetValue(timerSeconds); timerDisplays[timerDisplays.size - 1] SetValue(timerSeconds);
wait (1 - (timerDisplays[2].inFrames * 0.05)); wait (1 - (timerDisplays[timerDisplays.size - 1].inFrames * 0.05));
} }
if (!level.gameEnded) if (!level.gameEnded)
@ -663,8 +659,15 @@ handleHider() {
if (!gameFlag("seekers_released")) if (!gameFlag("seekers_released"))
{ {
gameFlagWait("seekers_prerelease_setup");
rest = level.preReleaseTime - ((getTime() - level.preReleaseStart)/1000);
player setLowerMessage("seekerreleasemsg", &"HIDEANDSEEK_TIMER_SEEKER_RELEASE", rest, 90);
gameFlagWait("seekers_released"); gameFlagWait("seekers_released");
player clearLowerMessage("seekerreleasemsg");
/* /*
player giveWeapon("deserteagle_tactical_mp", 0, false); player giveWeapon("deserteagle_tactical_mp", 0, false);
player switchtoWeapon("deserteagle_tactical_mp"); player switchtoWeapon("deserteagle_tactical_mp");

3
spanish/localizedstrings/hns.str
View File

@ -17,9 +17,6 @@ REFERENCE OBJECTIVES_HIDEANDSEEK_DEFENDER
LANG_ENGLISH "Disguise yourself and survive." LANG_ENGLISH "Disguise yourself and survive."
REFERENCE HIDEANDSEEK_TIMER_SEEKER_RELEASE REFERENCE HIDEANDSEEK_TIMER_SEEKER_RELEASE
LANG_ENGLISH "Seekers released in &&1"
REFERENCE HIDEANDSEEK_TIMER_SEEKER_RELEASE_TITLE
LANG_ENGLISH "Seekers will be released in:" LANG_ENGLISH "Seekers will be released in:"
REFERENCE HIDEANDSEEK_SEEKERS_RELEASED REFERENCE HIDEANDSEEK_SEEKERS_RELEASED