simulate p1/p2 score

Author: bitwes

TddAndPong/Episode4/scenes/Game.tscn

@@ -32,5 +32,19 @@ position = Vector2( 285, 289.5 )
 [node name="P2KillBox" parent="." instance=ExtResource( 5 )]
 position = Vector2( 667.5, 289.5 )
 
+[node name="P1Score" type="Label" parent="."]
+margin_left = 373.0
+margin_top = 12.6667
+margin_right = 432.0
+margin_bottom = 26.6667
+text = "p1  score"
+
+[node name="P2Score" type="Label" parent="."]
+margin_left = 497.833
+margin_top = 13.0
+margin_right = 556.833
+margin_bottom = 27.0
+text = "p2  score"
+
 [connection signal="kill_ball" from="P1KillBox" to="." method="_on_P1KillBox_kill_ball"]
 [connection signal="kill_ball" from="P2KillBox" to="." method="_on_P2KillBox_kill_ball"]

TddAndPong/Episode4/scripts/game.gd

@@ -1,6 +1,8 @@
 extends Node2D
 
 var _ball_start_pos = null
+var _p1_score = 0
+var _p2_score = 0
 
 func _ready():
 	$Ball.set_speed(300)
@@ -10,6 +12,8 @@ func _ready():
 	$P1Paddle.set_speed(300)
 	$P2Paddle.set_speed(300)
 
+	_update_display()
+	
 func _process(delta):
 	if Input.is_action_pressed("p1_up"):
 		$P1Paddle.move_up(delta)
@@ -23,10 +27,31 @@ func _process(delta):
 
 func _on_P2KillBox_kill_ball():
 	$Ball.set_position(_ball_start_pos)
+	_p1_score += 1
+	_update_display()
 
 
 func _on_P1KillBox_kill_ball():
 	$Ball.set_position(_ball_start_pos)
+	_p2_score += 1
+	_update_display()
+
+func _update_display():
+	$P1Score.set_text(str(_p1_score))
+	$P2Score.set_text(str(_p2_score))
 
 func get_ball():
-	return $Ball
+	return $Ball
+	
+func get_p1_score():
+	return _p1_score
+
+func set_p1_score(p1_score):
+	_p1_score = p1_score
+
+func get_p2_score():
+	return _p2_score
+
+func set_p2_score(p2_score):
+	_p2_score = p2_score
+	

TddAndPong/Episode4/test/unit/test_game.gd

@@ -11,9 +11,21 @@ func before_each():
 func after_each():
 	remove_child(_game)
 
+func _simulate_p1_score(game):
+	game.get_node('P2KillBox').emit_signal('kill_ball')
+	
+func _simulate_p2_score(game):
+	game.get_node('P1KillBox').emit_signal('kill_ball')
+
 func test_can_make_game():
 	assert_not_null(Game.instance())
 
+func test_get_set_p1_score():
+	assert_accessors(_game, 'p1_score', 0, 10)
+	
+func test_get_set_p2_score():
+	assert_accessors(_game, 'p2_score', 0, 10)
+	
 func test_when_p1_killbox_emits_kill_ball_then_ball_is_recentered():
 	var ball = _game.get_ball()
 	var orig_pos = ball.get_position()
@@ -31,3 +43,30 @@ func test_when_p2_killbox_emits_kill_ball_then_ball_is_recentered():
 	ball.set_position(Vector2(1, 1))
 	kb.emit_signal('kill_ball')
 	assert_eq(ball.get_position(), orig_pos)
+
+func test_when_p1_kill_box_kills_ball_p2_score_increases():
+	_simulate_p2_score(_game)
+	assert_eq(_game.get_p2_score(), 1)
+	
+func test_when_p2_kill_box_kills_ball_p1_score_increases():
+	_simulate_p1_score(_game)
+	assert_eq(_game.get_p1_score(), 1)
+	
+func test_score_labels_show_score_on_start():
+	assert_eq(_game.get_node("P1Score").get_text(), '0', 'p1 initial score')
+	assert_eq(_game.get_node("P2Score").get_text(), '0', 'p2 initial score')
+	
+func test_when_p1_scores_then_score_is_update():
+	_simulate_p1_score(_game)
+	assert_eq(_game.get_node("P1Score").get_text(), '1')
+	
+func test_when_p2_scores_then_score_is_update():
+	_simulate_p2_score(_game)
+	assert_eq(_game.get_node("P2Score").get_text(), '1')
+
+	
+	
+	
+	
+	
+