bendns' repos / chess
online multiplayer chess game (note server currently down)
better chess clock
Browse Source
bendn 2022-05-18
parent a9ef9e2 · commit d658701
Diffstat
-rw-r--r--.gitignore1
-rw-r--r--Grid.gd4
-rw-r--r--ui/Timer.gd4
-rw-r--r--ui/TimerLabels.gd17
4 files changed, 16 insertions, 10 deletions
diff --git a/.gitignore b/.gitignore
index 56ac009..0bb148b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
.import/
logs/
*.sh
+*.py
.vscode/
diff --git a/Grid.gd b/Grid.gd
index c2b65d1..695eedd 100644
--- a/Grid.gd
+++ b/Grid.gd
@@ -28,6 +28,10 @@ export(Color) var board_color1 := Color(0.870588, 0.890196, 0.901961)
export(Color) var board_color2 := Color(0.54902, 0.635294, 0.678431)
export(Color) var overlay_color := Color(0.078431, 0.333333, 0.117647, 0.498039)
+export(Color) var clockrunning_color := Color(0.219608, 0.278431, 0.133333)
+export(Color) var clockrunninglow := Color(0.47451, 0.172549, 0.164706)
+export(Color) var clocklow := Color(0.313726, 0.156863, 0.14902)
+
var matrix := []
var promoting = null
var background_matrix := []
diff --git a/ui/Timer.gd b/ui/Timer.gd
index 41b60a1..6915862 100644
--- a/ui/Timer.gd
+++ b/ui/Timer.gd
@@ -1,7 +1,6 @@
extends Node
var enabled := false
-var time_elapsed := 0.0
var count := 0
@@ -10,8 +9,6 @@ onready var blacklabel := $"../BlackTime"
func _ready() -> void:
- whitelabel.time = 300
- blacklabel.time = 300
Events.connect("turn_over", self, "turn_over")
@@ -27,6 +24,5 @@ func _process(delta) -> void:
func turn_over() -> void:
- time_elapsed = 0.0
count += 1
enabled = count >= 2
diff --git a/ui/TimerLabels.gd b/ui/TimerLabels.gd
index 75cba88..03e8aee 100644
--- a/ui/TimerLabels.gd
+++ b/ui/TimerLabels.gd
@@ -1,8 +1,10 @@
extends Label
-var time := 0.0 setget set_time
+var time: float setget set_time
var stop := false
+const TIME = 300
+
export(bool) var white := false
onready var colorrect := $ColorRect
@@ -23,10 +25,10 @@ func set_time(newtime) -> bool:
func _ready() -> void:
- _on_turn_over()
+ set_time(TIME)
+ set_color()
colorrect.show_behind_parent = true
- colorrect.color = Globals.grid.overlay_color
- Events.connect("turn_over", self, "_on_turn_over")
+ Events.connect("turn_over", self, "set_color")
Events.connect("game_over", self, "_on_game_over")
@@ -34,5 +36,8 @@ func _on_game_over() -> void:
stop = true
-func _on_turn_over() -> void:
- colorrect.visible = Globals.turn == white
+func set_color() -> void:
+ if time > 10:
+ colorrect.color = Globals.grid.clockrunning_color if Globals.turn == white else Color.transparent
+ else:
+ colorrect.color = Globals.grid.clockrunninglow if Globals.turn == white else Globals.grid.clocklow