Adicionando tween aos botões do pause.

uspgamedev · Dec 6, 2015 · 6ac7f94 · 6ac7f94
1 parent 08ae9db
commit 6ac7f94
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 7 deletions.
diff --git a/default.xscn b/default.xscn
@@ -182,9 +182,9 @@
 				<string> "flat" </string>
 				<string> "clip_text" </string>
 				<string> "quit" </string>
-				<string> "_colide_com_barra" </string>
-				<string> "body_enter" </string>
 				<string> "_colide_com_brick" </string>
+				<string> "body_enter" </string>
+				<string> "_colide_com_barra" </string>
 			</string_array>
 			<string> "node_count" </string>
 			<int> 22 </int>
@@ -319,9 +319,9 @@
 						<string> "Script" </string>
 						<dictionary  shared="false">
 							<string> "current" </string>
-							<int> 1 </int>
+							<int> 4 </int>
 							<string> "sources" </string>
-							<array  len="8" shared="false">
+							<array  len="10" shared="false">
 								<string> "res://ball.gd" </string>
 								<string> "res://main.gd" </string>
 								<string> "res://bar.gd" </string>
@@ -330,6 +330,8 @@
 								<string> "res://sound_fx.gd" </string>
 								<string> "res://song.gd" </string>
 								<string> "res://green-brick.gd" </string>
+								<string> "res://resume.gd" </string>
+								<string> "res://quit_button.gd" </string>
 							</array>
 						</dictionary>
 					</dictionary>

diff --git a/green-brick.gd b/green-brick.gd
@@ -18,7 +18,7 @@ func _ready():
 	var posicao = get_pos()
 	var random = 0.5 + randf()
 
-	tween.interpolate_method(self, "set_pos", Vector2(posicao.x, posicao.y + 100), self.get_pos(), random, Tween.TRANS_ELASTIC, Tween.EASE_OUT)
+	tween.interpolate_method(self, "set_pos", Vector2(posicao.x, posicao.y - 100), self.get_pos(), random, Tween.TRANS_ELASTIC, Tween.EASE_OUT)
 
 	tween.set_repeat(false)
 	tween.start()

diff --git a/main.gd b/main.gd
@@ -72,7 +72,9 @@ func _input(event):
 			Input.set_mouse_mode(Input.MOUSE_MODE_VISIBLE)
 			bg.set_opacity(0.5)
 			resume.show()
+			resume.tween()
 			quit.show()
+			quit.tween()
 		else:
 			var bar_pos = bar.get_pos()
 			get_tree().set_pause(false)

diff --git a/quit_button.gd b/quit_button.gd
@@ -17,4 +17,12 @@ func _fixed_process(delta):
 		hover = 1 
 	elif (not is_hovered()):
 		hover = 0
+
+func tween():
+	var tween = get_node("../Tween")
+
+	tween.interpolate_method(self, "set_pos", Vector2(-331, 312), Vector2(226, 312), 1, Tween.TRANS_ELASTIC, Tween.EASE_OUT)
+
+	tween.set_repeat(false)
+	tween.start()
 
diff --git a/red-brick.gd b/red-brick.gd
@@ -20,7 +20,7 @@ func _ready():
 	var posicao = get_pos()
 	var random = 0.5 + randf()
 
-	tween.interpolate_method(self, "set_pos", Vector2(posicao.x, posicao.y + 100), self.get_pos(), random, Tween.TRANS_ELASTIC, Tween.EASE_OUT)
+	tween.interpolate_method(self, "set_pos", Vector2(posicao.x, posicao.y - 100), self.get_pos(), random, Tween.TRANS_ELASTIC, Tween.EASE_OUT)
 
 	tween.set_repeat(false)
 	tween.start()

diff --git a/resume.gd b/resume.gd
@@ -20,4 +20,12 @@ func _input_event(event):
 		var main = get_node("../")
 		hide()
 		main.resume()
+
+func tween():
+	var tween = get_node("../Tween")
+
+	tween.interpolate_method(self, "set_pos", Vector2(800, 210), Vector2(226, 210), 1, Tween.TRANS_ELASTIC, Tween.EASE_OUT)
+
+	tween.set_repeat(false)
+	tween.start()
 
diff --git a/yellow-brick.gd b/yellow-brick.gd
@@ -19,7 +19,7 @@ func _ready():
 
 	#falling level:
 
-	tween.interpolate_method(self, "set_pos", Vector2(posicao.x, posicao.y + 100), self.get_pos(), random, Tween.TRANS_ELASTIC, Tween.EASE_OUT)
+	tween.interpolate_method(self, "set_pos", Vector2(posicao.x, posicao.y - 100), self.get_pos(), random, Tween.TRANS_ELASTIC, Tween.EASE_OUT)
 
 	tween.set_repeat(false)
 	tween.start()