ball resets now

Author: bitwes

TddAndPong/Episode4/scenes/Game.tscn

@@ -1,9 +1,10 @@
-[gd_scene load_steps=5 format=2]
+[gd_scene load_steps=6 format=2]
 
 [ext_resource path="res://scripts/game.gd" type="Script" id=1]
 [ext_resource path="res://scenes/Ball.tscn" type="PackedScene" id=2]
 [ext_resource path="res://scenes/Wall.tscn" type="PackedScene" id=3]
 [ext_resource path="res://scenes/Paddle.tscn" type="PackedScene" id=4]
+[ext_resource path="res://scenes/KillBox.tscn" type="PackedScene" id=5]
 
 [node name="Game" type="Node2D"]
 script = ExtResource( 1 )
@@ -25,3 +26,11 @@ position = Vector2( 353, 225 )
 [node name="P2Paddle" parent="." instance=ExtResource( 4 )]
 position = Vector2( 578, 218 )
 
+[node name="P1KillBox" parent="." instance=ExtResource( 5 )]
+position = Vector2( 285, 289.5 )
+
+[node name="P2KillBox" parent="." instance=ExtResource( 5 )]
+position = Vector2( 667.5, 289.5 )
+
+[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/scenes/KillBox.tscn

@@ -0,0 +1,14 @@
+[gd_scene load_steps=3 format=2]
+
+[ext_resource path="res://scripts/killbox.gd" type="Script" id=1]
+
+[sub_resource type="RectangleShape2D" id=1]
+extents = Vector2( 10, 371 )
+
+[node name="KillBox" type="Area2D"]
+script = ExtResource( 1 )
+
+[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
+shape = SubResource( 1 )
+
+[connection signal="area_entered" from="." to="." method="_on_KillBox_area_entered"]

TddAndPong/Episode4/scripts/game.gd

@@ -1,8 +1,11 @@
 extends Node2D
 
+var _ball_start_pos = null
+
 func _ready():
 	$Ball.set_speed(300)
 	$Ball.set_direction(Vector2(1, 1))
+	_ball_start_pos = $Ball.get_position()
 
 	$P1Paddle.set_speed(300)
 	$P2Paddle.set_speed(300)
@@ -16,3 +19,14 @@ func _process(delta):
 		$P2Paddle.move_up(delta)
 	if Input.is_action_pressed("p2_down"):
 		$P2Paddle.move_down(delta)
+
+
+func _on_P2KillBox_kill_ball():
+	$Ball.set_position(_ball_start_pos)
+
+
+func _on_P1KillBox_kill_ball():
+	$Ball.set_position(_ball_start_pos)
+
+func get_ball():
+	return $Ball

TddAndPong/Episode4/scripts/killbox.gd

@@ -0,0 +1,6 @@
+extends Area2D
+
+signal kill_ball
+
+func _on_KillBox_area_entered(area):
+	emit_signal('kill_ball')

TddAndPong/Episode4/test/Tests.tscn

@@ -14,7 +14,7 @@ script = ExtResource( 1 )
 __meta__ = {
 "_editor_icon": ExtResource( 2 )
 }
-_select_script = "test_wall_and_paddle"
+_select_script = "test_game"
 _run_on_load = true
 _should_maximize = true
 _yield_between_tests = false

TddAndPong/Episode4/test/unit/test_game.gd

@@ -0,0 +1,33 @@
+extends 'res://addons/gut/test.gd'
+
+var Game = load('res://scenes/Game.tscn')
+
+var _game = null
+
+func before_each():
+	_game = Game.instance()
+	add_child(_game)
+	
+func after_each():
+	remove_child(_game)
+	
+func test_can_make_game():
+	assert_not_null(Game.instance())
+	
+func test_when_p1_killbox_emits_kill_ball_then_ball_is_recentered():
+	var ball = _game.get_ball()
+	var orig_pos = ball.get_position()
+	var kb  = _game.get_node("P1KillBox")
+	
+	ball.set_position(Vector2(1, 1))
+	kb.emit_signal('kill_ball')
+	assert_eq(ball.get_position(), orig_pos)
+
+func test_when_p2_killbox_emits_kill_ball_then_ball_is_recentered():
+	var ball = _game.get_ball()
+	var orig_pos = ball.get_position()
+	var kb  = _game.get_node("P2KillBox")
+	
+	ball.set_position(Vector2(1, 1))
+	kb.emit_signal('kill_ball')
+	assert_eq(ball.get_position(), orig_pos)