X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=score.js;h=bedb8299f337b8c3519377aac03750cff2797acb;hb=342bae451d406b44d8fb47ceca5213f308d5e797;hp=273a311896ee3712ef8c87bc48d7971b4ab01f80;hpb=742194d6c8b42570e529c6099fa8125ad9e423f2;p=ultimatescore

diff --git a/score.js b/score.js
index 273a311..bedb829 100644
--- a/score.js
+++ b/score.js
@@ -1,18 +1,17 @@
 'use strict';
 
-let clock_running = false;
-let clock2_running = false;
+let num_clocks = 2;
+let clocks = [
+	{ 'running': false, 'elapsed': 0, 'origin': undefined, 'id': 'clock' },
+	{ 'running': false, 'elapsed': 0, 'origin': undefined, 'id': 'clock2' }
+];
+
 let clock_visible = false;
-let scorebug2_visible = false;
 let comment_visible = false;
 let lowerthird_visible = false;
-let clock_elapsed = 0;
-let clock2_elapsed = 0;
 let clock_limit = 30 * 60;
 let scoreA = 0;
 let scoreB = 0;
-let clock_origin;
-let clock2_origin;
 let state = {};
 
 function setteams()
@@ -50,77 +49,46 @@ function setscore2()
 	document.getElementById('score2_score').innerHTML = scoreA + " â€“ " + scoreB;
 }
 
-function startclock()
+function startclock(num)
 {
-	if (!clock_running) {
-		clock_origin = Date.now();
-		clock_running = true;
+	if (!clocks[num].running) {
+		clocks[num].origin = Date.now();
+		clocks[num].running = true;
 	}
-	showclock();
-}
-
-function startclock2()
-{
-	if (!clock2_running) {
-		clock2_origin = Date.now();
-		clock2_running = true;
+	if (num == 0) {
+		showclock();
 	}
-	// No showclock.
 }
 
-function stopclock()
+function stopclock(num)
 {
-	if (!clock_running) return;
-	clock_elapsed = time_elapsed();
-	clock_origin = Date.now();
-	clock_running = false;
+	if (!clocks[num].running) return;
+	clocks[num].elapsed = time_elapsed(num);
+	clocks[num].origin = Date.now();
+	clocks[num].running = false;
 }
 
-function stopclock2()
+function setclock(num, amount)
 {
-	if (!clock2_running) return;
-	clock2_elapsed = time2_elapsed();
-	clock2_origin = Date.now();
-	clock2_running = false;
-}
-
-function setclock(amount)
-{
-	clock_elapsed = amount;
-	clock_origin = Date.now();
-	update_clock();
-}
-
-function setclock2(amount)
-{
-	clock2_elapsed = amount;
-	clock2_origin = Date.now();
-	update_clock2();
+	clocks[num].elapsed = amount;
+	clocks[num].origin = Date.now();
+	update_clock(num);
 }
 
 function setclockfromstate()
 {
 	let amount = parseInt(state['clock_min']) * 60 + parseInt(state['clock_sec']);
-	setclock(amount);
+	setclock(0, amount);
 }
 
 // No setclock2fromstate.
 
-function adjustclockfromstate()
-{
-	let amount = parseInt(state['clock_min']) * 60 + parseInt(state['clock_sec']);
-	let elapsed = time_elapsed_raw();
-	if (Math.abs(amount - elapsed) >= 2.0) {
-		setclock(amount);
-	}
-}
-
-function adjustclock2fromstate()
+function adjustclockfromstate(num)
 {
 	let amount = parseInt(state['clock_min']) * 60 + parseInt(state['clock_sec']);
-	let elapsed = time_elapsed2_raw();
+	let elapsed = time_elapsed_raw(num);
 	if (Math.abs(amount - elapsed) >= 2.0) {
-		setclock2(amount);
+		setclock(num, amount);
 	}
 }
 
@@ -188,7 +156,7 @@ function setandshowlowerthird()
 	if (state['image'] === undefined) {
 		img.style.display = 'none';
 	} else {
-		img.src = state['image'];	
+		img.src = state['image'];
 		img.style.display = 'inline';
 	}
 	showlowerthird();
@@ -206,48 +174,42 @@ function hidelowerthird()
 	lowerthird_visible = false;
 }
 
-function time_elapsed_raw()
+function time_elapsed_raw(num)
 {
-	let elapsed = (Date.now() - clock_origin) * 1e-3;
-	if (clock_elapsed + elapsed >= clock_limit) {
-		clock_elapsed = clock_limit;
-		clock_origin = Date.now();
-		clock_running = false;
-		return clock_limit;
-	}
-	return clock_elapsed + elapsed;
-}
+	let elapsed = (Date.now() - clocks[num].origin) * 1e-3;
+	if (clocks[num].elapsed + elapsed >= clock_limit) {
+		console.log("limit for", num);
+		if (num == 0) {
+			clocks[num].elapsed = clock_limit;
+			clocks[num].origin = Date.now();
+			clocks[num].running = false;
+
+			if (state['autocomment_on_clock_limit'] == '1' && !comment_visible) {
+				state['comment'] = state['autocomment'];
+				setcomment();
+				showcomment();
+			}
+		}
 
-function time_elapsed2_raw()
-{
-	let elapsed = (Date.now() - clock2_origin) * 1e-3;
-	if (clock2_elapsed + elapsed >= clock_limit) {
-		// No separate clock 2 limit.
 		return clock_limit;
 	}
-	return clock2_elapsed + elapsed;
-}
-
-function time_elapsed()
-{
-	return Math.floor(time_elapsed_raw());
+	return clocks[num].elapsed + elapsed;
 }
 
-function time_elapsed2()
+function time_elapsed(num)
 {
-	return Math.floor(time_elapsed2_raw());
+	return Math.floor(time_elapsed_raw(num));
 }
 
-function update_clock()
+function update_given_clock(elapsed, id)
 {
-	let elapsed = time_elapsed();
 	let min = Math.floor(elapsed / 60);
 	let sec = elapsed % 60;
 
 	if (sec < 10) sec = "0" + sec;
 	let text = min + ":" + sec;
 
-	if (false) {
+	if (ultimateconfig['exohack']) {
 		// This is a hack around the fact that Exo has variable-width numerals.
 		// It doesn't look fantastic, but for the clock, it's better not to have
 		// the text jumping around.
@@ -259,22 +221,15 @@ function update_clock()
 				html += "<div style='display: inline-block; width: 15px'>" + text.charAt(i) + "</div>";
 			}
 		}
-		document.getElementById('clock').innerHTML = html;
+		document.getElementById(id).innerHTML = html;
 	} else {
-		document.getElementById('clock').innerHTML = text;
+		document.getElementById(id).innerHTML = text;
 	}
 }
 
-function update_clock2()
+function update_clock(num)
 {
-	let elapsed = time_elapsed2();
-	let min = Math.floor(elapsed / 60);
-	let sec = elapsed % 60;
-
-	if (sec < 10) sec = "0" + sec;
-	let text = min + ":" + sec;
-
-	document.getElementById('clock2').innerHTML = text;
+	update_given_clock(time_elapsed(num), clocks[num].id);
 }
 
 function goalA()
@@ -327,11 +282,10 @@ function update(v)
 }
 
 setInterval(function() {
-	if (clock_running) {
-		update_clock();
-	}
-	if (clock2_running) {
-		update_clock2();
+	for (let i = 0; i < num_clocks; ++i) {
+		if (clocks[i].running) {
+			update_clock(i);
+		}
 	}
 }, 100);
 update_score();