Merge pull request #318 from cbscribe/dodge_31_updates

Update Dodge demo to match 3.1 docs

Author: akien-mga

2d/dodge_the_creeps/HUD.gd

@@ -10,9 +10,10 @@ func show_message(text):
 func show_game_over():
 	show_message("Game Over")
 	yield($MessageTimer, "timeout")
-	$StartButton.show()
-	$MessageLabel.text = "Dodge the\nCreeps!"
+	$MessageLabel.text = "Dodge the\nCreeps"
 	$MessageLabel.show()
+	yield(get_tree().create_timer(1), 'timeout')
+	$StartButton.show()
 
 func update_score(score):
 	$ScoreLabel.text = str(score)

2d/dodge_the_creeps/HUD.tscn

@@ -1,63 +1,62 @@
-[gd_scene load_steps=6 format=2]
+[gd_scene load_steps=7 format=2]
 
 [ext_resource path="res://HUD.gd" type="Script" id=1]
 [ext_resource path="res://fonts/Xolonium-Regular.ttf" type="DynamicFontData" id=2]
 
 [sub_resource type="DynamicFont" id=1]
+
 size = 64
 font_data = ExtResource( 2 )
 
 [sub_resource type="DynamicFont" id=2]
-size = 72
-font_data = ExtResource( 2 )
 
-[sub_resource type="DynamicFont" id=3]
-size = 48
+size = 64
 font_data = ExtResource( 2 )
 
+[sub_resource type="InputEventAction" id=3]
+
+action = "ui_select"
+
+[sub_resource type="ShortCut" id=4]
+
+shortcut = SubResource( 3 )
+
 [node name="HUD" type="CanvasLayer"]
 script = ExtResource( 1 )
 
 [node name="ScoreLabel" type="Label" parent="."]
-anchor_left = 0.5
-anchor_right = 0.5
-margin_left = -25.0
-margin_right = 25.0
-margin_bottom = 100.0
+anchor_right = 1.0
+margin_bottom = 78.0
 custom_fonts/font = SubResource( 1 )
 text = "0"
 align = 1
 
 [node name="MessageLabel" type="Label" parent="."]
-anchor_left = 0.5
 anchor_top = 0.5
-anchor_right = 0.5
+anchor_right = 1.0
 anchor_bottom = 0.5
-margin_left = -200.0
-margin_top = -150.0
-margin_right = 200.0
-margin_bottom = 50.0
-custom_fonts/font = SubResource( 2 )
+margin_top = -79.5
+margin_bottom = 79.5
+custom_fonts/font = SubResource( 1 )
 text = "Dodge the
-Creeps!"
+Creeps"
 align = 1
-valign = 1
-
-[node name="MessageTimer" type="Timer" parent="."]
-wait_time = 2.0
-one_shot = true
 
 [node name="StartButton" type="Button" parent="."]
 anchor_left = 0.5
 anchor_top = 1.0
 anchor_right = 0.5
 anchor_bottom = 1.0
-margin_left = -100.0
+margin_left = -90.0
 margin_top = -200.0
-margin_right = 100.0
+margin_right = 90.0
 margin_bottom = -100.0
-custom_fonts/font = SubResource( 3 )
+custom_fonts/font = SubResource( 2 )
+shortcut = SubResource( 4 )
 text = "Start"
 
-[connection signal="timeout" from="MessageTimer" to="." method="_on_MessageTimer_timeout"]
+[node name="MessageTimer" type="Timer" parent="."]
+one_shot = true
+
 [connection signal="pressed" from="StartButton" to="." method="_on_StartButton_pressed"]
+[connection signal="timeout" from="MessageTimer" to="." method="_on_MessageTimer_timeout"]

2d/dodge_the_creeps/Main.gd

@@ -6,37 +6,35 @@ var score
 func _ready():
 	randomize()
 
+func game_over():
+	$ScoreTimer.stop()
+	$MobTimer.stop()
+	$HUD.show_game_over()
+	$Music.stop()
+	$DeathSound.play()
+
 func new_game():
 	score = 0
-	$HUD.update_score(score)
 	$Player.start($StartPosition.position)
 	$StartTimer.start()
+	$HUD.update_score(score)
 	$HUD.show_message("Get Ready")
 	$Music.play()
 
-func game_over():
-	$DeathSound.play()
-	$Music.stop()
-	$ScoreTimer.stop()
-	$MobTimer.stop()
-	$HUD.show_game_over()
-
 func _on_MobTimer_timeout():
-	# choose a random location on the Path2D
-	$MobPath/MobSpawnLocation.set_offset(randi())
+	$MobPath/MobSpawnLocation.offset = randi()
 	var mob = Mob.instance()
 	add_child(mob)
 	var direction = $MobPath/MobSpawnLocation.rotation + PI/2
 	mob.position = $MobPath/MobSpawnLocation.position
-	# add some randomness to the direction
 	direction += rand_range(-PI/4, PI/4)
 	mob.rotation = direction
-	mob.set_linear_velocity(Vector2(rand_range(mob.MIN_SPEED, mob.MAX_SPEED), 0).rotated(direction))
-
-func _on_StartTimer_timeout():
-	$MobTimer.start()
-	$ScoreTimer.start()
+	mob.linear_velocity = Vector2(rand_range(mob.min_speed, mob.max_speed), 0).rotated(direction)
 
 func _on_ScoreTimer_timeout():
 	score += 1
 	$HUD.update_score(score)
+
+func _on_StartTimer_timeout():
+	$MobTimer.start()
+	$ScoreTimer.start()

2d/dodge_the_creeps/Main.tscn

@@ -9,17 +9,17 @@
 
 [sub_resource type="Curve2D" id=1]
 _data = {
-"points": PoolVector2Array( 0, 0, 0, 0, 1.70602, 3.56798, 0, 0, 0, 0, 482.263, 3.26522, 0, 0, 0, 0, 480.489, 729.458, 0, 0, 0, 0, 0.794434, 732.118, 0, 0, 0, 0, 1.97066, 3.83263 )
+"points": PoolVector2Array( 0, 0, 0, 0, -0.901337, 0.225891, 0, 0, 0, 0, 480.262, 1.29041, 0, 0, 0, 0, 481.327, 700.681, 0, 0, 0, 0, 0.163177, 698.552, 0, 0, 0, 0, -0.901337, 0.225891 )
 }
 
 [node name="Main" type="Node"]
 script = ExtResource( 1 )
 Mob = ExtResource( 2 )
 
 [node name="ColorRect" type="ColorRect" parent="."]
-margin_right = 486.0
-margin_bottom = 734.0
-color = Color( 0.253451, 0.425288, 0.429412, 1 )
+anchor_right = 1.0
+anchor_bottom = 1.0
+color = Color( 0.223529, 0.317647, 0.368627, 1 )
 
 [node name="Player" parent="." instance=ExtResource( 3 )]
 
@@ -35,22 +35,20 @@ one_shot = true
 [node name="StartPosition" type="Position2D" parent="."]
 position = Vector2( 240, 450 )
 
+[node name="MobPath" type="Path2D" parent="."]
+curve = SubResource( 1 )
+
+[node name="MobSpawnLocation" type="PathFollow2D" parent="MobPath"]
+position = Vector2( -0.901337, 0.225891 )
+rotation = 0.00221238
+
 [node name="HUD" parent="." instance=ExtResource( 4 )]
 
 [node name="Music" type="AudioStreamPlayer" parent="."]
 stream = ExtResource( 5 )
-volume_db = -8.0
 
 [node name="DeathSound" type="AudioStreamPlayer" parent="."]
 stream = ExtResource( 6 )
-volume_db = -5.0
-
-[node name="MobPath" type="Path2D" parent="."]
-curve = SubResource( 1 )
-
-[node name="MobSpawnLocation" type="PathFollow2D" parent="MobPath"]
-position = Vector2( 1.70602, 3.56798 )
-rotation = -0.000630111
 
 [connection signal="hit" from="Player" to="." method="game_over"]
 [connection signal="timeout" from="MobTimer" to="." method="_on_MobTimer_timeout"]

2d/dodge_the_creeps/Mob.gd

@@ -1,11 +1,11 @@
 extends RigidBody2D
 
-export (int) var MIN_SPEED
-export (int) var MAX_SPEED
+export var min_speed = 150
+export var max_speed = 250
 var mob_types = ["walk", "swim", "fly"]
 
 func _ready():
 	$AnimatedSprite.animation = mob_types[randi() % mob_types.size()]
 
-func _on_Visibility_screen_exited():
-	queue_free()
+func _on_VisibilityNotifier2D_screen_exited():
+	queue_free()

2d/dodge_the_creeps/Mob.tscn

@@ -1,58 +1,55 @@
 [gd_scene load_steps=10 format=2]
 
 [ext_resource path="res://Mob.gd" type="Script" id=1]
-[ext_resource path="res://art/enemyWalking_1.png" type="Texture" id=2]
-[ext_resource path="res://art/enemyWalking_2.png" type="Texture" id=3]
-[ext_resource path="res://art/enemyFlyingAlt_1.png" type="Texture" id=4]
-[ext_resource path="res://art/enemyFlyingAlt_2.png" type="Texture" id=5]
-[ext_resource path="res://art/enemySwimming_1.png" type="Texture" id=6]
-[ext_resource path="res://art/enemySwimming_2.png" type="Texture" id=7]
+[ext_resource path="res://art/enemySwimming_1.png" type="Texture" id=2]
+[ext_resource path="res://art/enemySwimming_2.png" type="Texture" id=3]
+[ext_resource path="res://art/enemyWalking_1.png" type="Texture" id=4]
+[ext_resource path="res://art/enemyWalking_2.png" type="Texture" id=5]
+[ext_resource path="res://art/enemyFlyingAlt_1.png" type="Texture" id=6]
+[ext_resource path="res://art/enemyFlyingAlt_2.png" type="Texture" id=7]
 
 [sub_resource type="SpriteFrames" id=1]
+
 animations = [ {
 "frames": [ ExtResource( 2 ), ExtResource( 3 ) ],
 "loop": true,
-"name": "walk",
+"name": "swim",
 "speed": 4.0
 }, {
 "frames": [ ExtResource( 4 ), ExtResource( 5 ) ],
 "loop": true,
-"name": "fly",
-"speed": 3.0
+"name": "walk",
+"speed": 4.0
 }, {
 "frames": [ ExtResource( 6 ), ExtResource( 7 ) ],
 "loop": true,
-"name": "swim",
-"speed": 4.0
+"name": "fly",
+"speed": 3.0
 } ]
 
 [sub_resource type="CapsuleShape2D" id=2]
-radius = 34.8222
-height = 28.8308
+
+radius = 35.2706
+height = 23.3281
 
 [node name="Mob" type="RigidBody2D"]
-input_pickable = true
 collision_mask = 0
 gravity_scale = 0.0
-linear_damp = 0.1
-angular_damp = 1.0
 script = ExtResource( 1 )
 __meta__ = {
 "_edit_group_": true
 }
-MIN_SPEED = 150
-MAX_SPEED = 250
 
 [node name="AnimatedSprite" type="AnimatedSprite" parent="."]
 scale = Vector2( 0.75, 0.75 )
 frames = SubResource( 1 )
-animation = "swim"
-frame = 1
+animation = "walk"
 playing = true
 
-[node name="Collision" type="CollisionShape2D" parent="."]
+[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
 rotation = 1.5708
 shape = SubResource( 2 )
 
-[node name="Visibility" type="VisibilityNotifier2D" parent="."]
+[node name="VisibilityNotifier2D" type="VisibilityNotifier2D" parent="."]
 
+[connection signal="screen_exited" from="VisibilityNotifier2D" to="." method="_on_VisibilityNotifier2D_screen_exited"]

2d/dodge_the_creeps/Player.gd

@@ -2,41 +2,32 @@ extends Area2D
 
 signal hit
 
-export (int) var SPEED
-var velocity = Vector2()
-var screensize
+export var speed = 400
+var extents
+var screen_size
 
 func _ready():
+	screen_size = get_viewport_rect().size
 	hide()
-	screensize = get_viewport_rect().size
-
-func start(pos):
-	position = pos
-	show()
-	# Must be deferred as we can't change physics properties on a physics callback
-	$Collision.set_deferred("disabled", false)
 
 func _process(delta):
-	velocity = Vector2()
+	var velocity = Vector2()
 	if Input.is_action_pressed("ui_right"):
 		velocity.x += 1
 	if Input.is_action_pressed("ui_left"):
 		velocity.x -= 1
-	if Input.is_action_pressed("ui_down"):
-		velocity.y += 1
 	if Input.is_action_pressed("ui_up"):
 		velocity.y -= 1
+	if Input.is_action_pressed("ui_down"):
+		velocity.y += 1
 	if velocity.length() > 0:
-		velocity = velocity.normalized() * SPEED
+		velocity = velocity.normalized() * speed
 		$AnimatedSprite.play()
-		$Trail.emitting = true
 	else:
 		$AnimatedSprite.stop()
-		$Trail.emitting = false
-
 	position += velocity * delta
-	position.x = clamp(position.x, 0, screensize.x)
-	position.y = clamp(position.y, 0, screensize.y)
+	position.x = clamp(position.x, 0, screen_size.x)
+	position.y = clamp(position.y, 0, screen_size.y)
 
 	if velocity.x != 0:
 		$AnimatedSprite.animation = "right"
@@ -46,8 +37,12 @@ func _process(delta):
 		$AnimatedSprite.animation = "up"
 		$AnimatedSprite.flip_v = velocity.y > 0
 
-func _on_Player_body_entered(_body):
-	# Must be deferred as we can't change physics properties on a physics callback
-	$Collision.set_deferred("disabled", true)
+func _on_Player_body_entered(body):
 	hide()
 	emit_signal("hit")
+	$CollisionShape2D.set_deferred("disabled", true)
+
+func start(pos):
+	position = pos
+	show()
+	$CollisionShape2D.disabled = false