Browse Source

bunch of fixes based on feedback, adding changelog

galo 1 year ago
parent
commit
a135259912
36 changed files with 238 additions and 102 deletions
  1. 3 0
      .import/1Estrela.PNG-6f97d733509eecbd1e46c212b3e3f4f0.md5
  2. BIN
      .import/1Estrela.PNG-6f97d733509eecbd1e46c212b3e3f4f0.stex
  3. 3 0
      .import/2Estrelas.PNG-863f4725a0578c36048b850a1a6ca5b5.md5
  4. BIN
      .import/2Estrelas.PNG-863f4725a0578c36048b850a1a6ca5b5.stex
  5. 3 0
      .import/3Estrelas.PNG-9c26437a08b305392aa53aa38232b9d6.md5
  6. BIN
      .import/3Estrelas.PNG-9c26437a08b305392aa53aa38232b9d6.stex
  7. 3 0
      .import/4Estrelas.PNG-b755e8d5caf2c81f569778741bae89fc.md5
  8. BIN
      .import/4Estrelas.PNG-b755e8d5caf2c81f569778741bae89fc.stex
  9. 3 0
      .import/5Estrelas.PNG-19974c1d169035e5fa1a49f5e3b4599c.md5
  10. BIN
      .import/5Estrelas.PNG-19974c1d169035e5fa1a49f5e3b4599c.stex
  11. 3 0
      .import/6Estrelas.PNG-e9d0d7abc2c38646d873c6c8e2226c91.md5
  12. BIN
      .import/6Estrelas.PNG-e9d0d7abc2c38646d873c6c8e2226c91.stex
  13. 3 0
      .import/7Estrelas.PNG-ad7cc03afeafdbecfa498f220c220c8f.md5
  14. BIN
      .import/7Estrelas.PNG-ad7cc03afeafdbecfa498f220c220c8f.stex
  15. 3 0
      .import/8Estrelas.PNG-1a63a71d99f980a98d1753594047e88f.md5
  16. BIN
      .import/8Estrelas.PNG-1a63a71d99f980a98d1753594047e88f.stex
  17. 3 0
      .import/attackspeed.png-cf8151a1b337bc434bb5590776270e7e.md5
  18. BIN
      .import/attackspeed.png-cf8151a1b337bc434bb5590776270e7e.stex
  19. 2 2
      .import/back.PNG-9c0ed08a114c9b550e95dd00b87007db.md5
  20. BIN
      .import/back.PNG-9c0ed08a114c9b550e95dd00b87007db.stex
  21. 2 2
      .import/buttonsOn.PNG-abf46fba5c2e4613b178bb477ceba92e.md5
  22. BIN
      .import/buttonsOn.PNG-abf46fba5c2e4613b178bb477ceba92e.stex
  23. 3 0
      .import/mainBG.PNG-387b3d37fbb7f95f1cd59887b2909842.md5
  24. BIN
      .import/mainBG.PNG-387b3d37fbb7f95f1cd59887b2909842.stex
  25. 2 2
      .import/play.png-7bd0a0a909edd1ae272335835918cbad.md5
  26. BIN
      .import/play.png-7bd0a0a909edd1ae272335835918cbad.stex
  27. 3 0
      .import/tmp.png-a7e802bd82f8d20f1bb6b901673c5981.md5
  28. BIN
      .import/tmp.png-a7e802bd82f8d20f1bb6b901673c5981.stex
  29. 1 0
      PowerUpControl.gd
  30. 27 0
      Tutorial.gd
  31. 8 6
      bacteria.tscn
  32. 102 72
      main.tscn
  33. 5 2
      mainmenu.gd
  34. 26 1
      powerups.gd
  35. 26 15
      ui/Button.tscn
  36. 4 0
      ui/TouchScreenButton.gd

+ 3 - 0
.import/1Estrela.PNG-6f97d733509eecbd1e46c212b3e3f4f0.md5

@@ -0,0 +1,3 @@
+source_md5="aece5e91cad9724faf915c1951318eab"
+dest_md5="2740feeae9ba7d5b78d4a62a90744c45"
+

BIN
.import/1Estrela.PNG-6f97d733509eecbd1e46c212b3e3f4f0.stex


+ 3 - 0
.import/2Estrelas.PNG-863f4725a0578c36048b850a1a6ca5b5.md5

@@ -0,0 +1,3 @@
+source_md5="0ac0359878aaedfe827c05e1dc3e46fc"
+dest_md5="f6ec5178062a098d1a2b276ddb70801c"
+

BIN
.import/2Estrelas.PNG-863f4725a0578c36048b850a1a6ca5b5.stex


+ 3 - 0
.import/3Estrelas.PNG-9c26437a08b305392aa53aa38232b9d6.md5

@@ -0,0 +1,3 @@
+source_md5="3714516adfe311ca0c4d777f58d70581"
+dest_md5="89abb5a80ce2487f6a82648e032f30ea"
+

BIN
.import/3Estrelas.PNG-9c26437a08b305392aa53aa38232b9d6.stex


+ 3 - 0
.import/4Estrelas.PNG-b755e8d5caf2c81f569778741bae89fc.md5

@@ -0,0 +1,3 @@
+source_md5="e42b72f76bc6a519a34571a05060383d"
+dest_md5="9f0a8ff1f5a12d840c4d310bf4e9aa07"
+

BIN
.import/4Estrelas.PNG-b755e8d5caf2c81f569778741bae89fc.stex


+ 3 - 0
.import/5Estrelas.PNG-19974c1d169035e5fa1a49f5e3b4599c.md5

@@ -0,0 +1,3 @@
+source_md5="186d9df1c6812977c150cfb778080645"
+dest_md5="9ed4d4c62d2bc469b4eaa2ceee8d2a8b"
+

BIN
.import/5Estrelas.PNG-19974c1d169035e5fa1a49f5e3b4599c.stex


+ 3 - 0
.import/6Estrelas.PNG-e9d0d7abc2c38646d873c6c8e2226c91.md5

@@ -0,0 +1,3 @@
+source_md5="4cc63aeb00bf3bf8dbc1c844c63ff27b"
+dest_md5="ac2bf5822e7f35c79598c31df1f49e2f"
+

BIN
.import/6Estrelas.PNG-e9d0d7abc2c38646d873c6c8e2226c91.stex


+ 3 - 0
.import/7Estrelas.PNG-ad7cc03afeafdbecfa498f220c220c8f.md5

@@ -0,0 +1,3 @@
+source_md5="991114c428928bb4de9ac100438da419"
+dest_md5="8ae2d97be605c11e5419de27726c2997"
+

BIN
.import/7Estrelas.PNG-ad7cc03afeafdbecfa498f220c220c8f.stex


+ 3 - 0
.import/8Estrelas.PNG-1a63a71d99f980a98d1753594047e88f.md5

@@ -0,0 +1,3 @@
+source_md5="9ecd81bc0625e08bc5be8d2a9d307d85"
+dest_md5="cd76dcbe1a5547b113fa204b38f6fedd"
+

BIN
.import/8Estrelas.PNG-1a63a71d99f980a98d1753594047e88f.stex


+ 3 - 0
.import/attackspeed.png-cf8151a1b337bc434bb5590776270e7e.md5

@@ -0,0 +1,3 @@
+source_md5="0cbe557deb558aee0e3382603539f838"
+dest_md5="865fd33634ac28a4dfbb13cec6d5bf3e"
+

BIN
.import/attackspeed.png-cf8151a1b337bc434bb5590776270e7e.stex


+ 2 - 2
.import/back.PNG-9c0ed08a114c9b550e95dd00b87007db.md5

@@ -1,3 +1,3 @@
-source_md5="7b8773209c521125fb1bfbd142de0d2e"
-dest_md5="50793ac8b1b883d038c8714404a97b04"
+source_md5="0fda12253778ebbecdc5f213f81c121b"
+dest_md5="32924a1403920c8862d1e4536e02dcf4"
 

BIN
.import/back.PNG-9c0ed08a114c9b550e95dd00b87007db.stex


+ 2 - 2
.import/buttonsOn.PNG-abf46fba5c2e4613b178bb477ceba92e.md5

@@ -1,3 +1,3 @@
-source_md5="64e3ed47a5374ccc5928e6aa6fe97a47"
-dest_md5="7a43794237159266c373d2b01978a54d"
+source_md5="75e9883640482228f1aaac3f864db8f2"
+dest_md5="2f748c8479e4ac2b2d8d5cc9f90cad2d"
 

BIN
.import/buttonsOn.PNG-abf46fba5c2e4613b178bb477ceba92e.stex


+ 3 - 0
.import/mainBG.PNG-387b3d37fbb7f95f1cd59887b2909842.md5

@@ -0,0 +1,3 @@
+source_md5="780ffc6f9bb9862fae5fd32119192dd3"
+dest_md5="d1d432226976647dc8468d55032dd44e"
+

BIN
.import/mainBG.PNG-387b3d37fbb7f95f1cd59887b2909842.stex


+ 2 - 2
.import/play.png-7bd0a0a909edd1ae272335835918cbad.md5

@@ -1,3 +1,3 @@
-source_md5="6f946d9332b3ea828143b1f1a761378b"
-dest_md5="167351c203c56b1ef43e24f4782da928"
+source_md5="fa0c1438fd95cc58f101283fa50dcd87"
+dest_md5="039b84c9629402b23b2a1ec0b4707610"
 

BIN
.import/play.png-7bd0a0a909edd1ae272335835918cbad.stex


+ 3 - 0
.import/tmp.png-a7e802bd82f8d20f1bb6b901673c5981.md5

@@ -0,0 +1,3 @@
+source_md5="9f75b62b04562639ee8e4bd48e426844"
+dest_md5="be74a36128e9b7452d36a03ecde4181d"
+

BIN
.import/tmp.png-a7e802bd82f8d20f1bb6b901673c5981.stex


+ 1 - 0
PowerUpControl.gd

@@ -23,6 +23,7 @@ func openmenu():
 	for x in 5:
 		$Control2/VSeparator/buttons.get_child(x).id = x
 		$Control2/VSeparator/buttons.get_child(x)._processUI(superdict[array[x]]['data'])
+		$Control2/VSeparator/buttons.get_child(x)._description(superdict[array[x]]['description'])
 		$Control2/VSeparator/buttons.get_child(x).set_texture( superdict[array[x]]['icone'] )
 		$Control2/VSeparator/buttons.get_child(x).text = superdict[array[x]]['name']
 		var buff = 0

+ 27 - 0
Tutorial.gd

@@ -0,0 +1,27 @@
+extends CanvasLayer
+
+export(NodePath) var playnode
+
+func _on_arrows_pressed():
+	$tut/AnimatedSprite.frame += 1
+	$tut/AnimatedSprite2.frame += 1
+	pass # Replace with function body.
+
+
+func _on_arrows2_pressed():
+	$tut/AnimatedSprite.frame -= 1
+	$tut/AnimatedSprite2.frame -= 1
+	pass # Replace with function body.
+
+
+func _on_back_pressed():
+	get_node(playnode).show()
+	$tut.hide()
+	pass # Replace with function body.
+
+
+func _on_howto_pressed():
+	yield(get_tree(),"physics_frame")
+	get_node(playnode).hide()
+	if !$tut.visible: $tut.show()
+	pass # Replace with function body.

+ 8 - 6
bacteria.tscn

@@ -267,13 +267,15 @@ progressbar = NodePath("../CanvasLayer/ProgressBar3")
 text = NodePath("../CanvasLayer/VBoxContainer/Label2")
 
 [node name="CanvasLayer" type="CanvasLayer" parent="."]
+offset = Vector2( 0, 60 )
+transform = Transform2D( 1, 0, 0, 1, 0, 60 )
 
 [node name="ProgressBar2" type="ProgressBar" parent="CanvasLayer"]
 show_behind_parent = true
-margin_left = 19.0
-margin_top = 18.0
+margin_left = 22.0
+margin_top = 21.0
 margin_right = 520.0
-margin_bottom = 40.0
+margin_bottom = 37.0
 theme = SubResource( 6 )
 custom_fonts/font = ExtResource( 6 )
 max_value = 0.1
@@ -281,10 +283,10 @@ percent_visible = false
 
 [node name="ProgressBar3" type="ProgressBar" parent="CanvasLayer"]
 show_behind_parent = true
-margin_left = 38.0
+margin_left = 41.0
 margin_top = 38.0
-margin_right = 502.0
-margin_bottom = 55.0
+margin_right = 501.0
+margin_bottom = 54.0
 theme = SubResource( 9 )
 custom_fonts/font = ExtResource( 6 )
 max_value = 50.0

+ 102 - 72
main.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=42 format=2]
+[gd_scene load_steps=56 format=2]
 
 [ext_resource path="res://spawner.gd" type="Script" id=1]
 [ext_resource path="res://bacteria.tscn" type="PackedScene" id=2]
@@ -20,6 +20,19 @@
 [ext_resource path="res://ui/logo.png" type="Texture" id=18]
 [ext_resource path="res://ui/play.png" type="Texture" id=19]
 [ext_resource path="res://mainmenu.gd" type="Script" id=20]
+[ext_resource path="res://ui/tutorial/tutorial/tmp.png" type="Texture" id=21]
+[ext_resource path="res://Tutorial.gd" type="Script" id=22]
+[ext_resource path="res://ui/tutorial/tutorial/back.PNG" type="Texture" id=23]
+[ext_resource path="res://ui/tutorial/tutorial/tutBG.PNG" type="Texture" id=24]
+[ext_resource path="res://ui/tutorial/tutorial/buttonsOn.PNG" type="Texture" id=25]
+[ext_resource path="res://ui/tutorial/tutorial/tut3.PNG" type="Texture" id=26]
+[ext_resource path="res://ui/tutorial/tutorial/tut2.PNG" type="Texture" id=27]
+[ext_resource path="res://ui/tutorial/tutorial/tut4.PNG" type="Texture" id=28]
+[ext_resource path="res://ui/tutorial/tutorial/tut4Text.PNG" type="Texture" id=29]
+[ext_resource path="res://ui/tutorial/tutorial/tut1.PNG" type="Texture" id=30]
+[ext_resource path="res://ui/tutorial/tutorial/tut1Text.PNG" type="Texture" id=31]
+[ext_resource path="res://ui/tutorial/tutorial/tut2Text.PNG" type="Texture" id=32]
+[ext_resource path="res://ui/tutorial/tutorial/tut3Text.PNG" type="Texture" id=33]
 
 [sub_resource type="DynamicFont" id=1]
 font_data = ExtResource( 6 )
@@ -270,7 +283,7 @@ tracks/5/keys = {
 resource_name = "Nova Animação"
 length = 3.0
 tracks/0/type = "value"
-tracks/0/path = NodePath("BesourinhoUltra4k:visible")
+tracks/0/path = NodePath("play/BesourinhoUltra4k:visible")
 tracks/0/interp = 1
 tracks/0/loop_wrap = true
 tracks/0/imported = false
@@ -282,7 +295,7 @@ tracks/0/keys = {
 "values": [ false, true ]
 }
 tracks/1/type = "value"
-tracks/1/path = NodePath("BesourinhoUltra4k2:visible")
+tracks/1/path = NodePath("play/BesourinhoUltra4k2:visible")
 tracks/1/interp = 1
 tracks/1/loop_wrap = true
 tracks/1/imported = false
@@ -294,7 +307,7 @@ tracks/1/keys = {
 "values": [ true, false ]
 }
 tracks/2/type = "animation"
-tracks/2/path = NodePath("BesourinhoUltra4k2/AnimationPlayer")
+tracks/2/path = NodePath("play/BesourinhoUltra4k2/AnimationPlayer")
 tracks/2/interp = 1
 tracks/2/loop_wrap = true
 tracks/2/imported = false
@@ -304,7 +317,7 @@ tracks/2/keys = {
 "times": PoolRealArray( 0 )
 }
 tracks/3/type = "value"
-tracks/3/path = NodePath("BesourinhoUltra4k2:position")
+tracks/3/path = NodePath("play/BesourinhoUltra4k2:position")
 tracks/3/interp = 1
 tracks/3/loop_wrap = true
 tracks/3/imported = false
@@ -316,7 +329,7 @@ tracks/3/keys = {
 "values": [ Vector2( 462, 1133 ), Vector2( 506, 969 ), Vector2( 520, 834 ), Vector2( 494, 664 ), Vector2( 284, 551 ), Vector2( 47, 616 ), Vector2( -2, 751 ), Vector2( 19, 892 ), Vector2( 121, 986 ), Vector2( 261, 1025 ), Vector2( 388, 1009 ), Vector2( 451, 936 ), Vector2( 464, 858 ), Vector2( 436, 817 ) ]
 }
 tracks/4/type = "value"
-tracks/4/path = NodePath("BesourinhoUltra4k2:rotation_degrees")
+tracks/4/path = NodePath("play/BesourinhoUltra4k2:rotation_degrees")
 tracks/4/interp = 2
 tracks/4/loop_wrap = true
 tracks/4/imported = false
@@ -330,54 +343,19 @@ tracks/4/keys = {
 
 [sub_resource type="Animation" id=19]
 length = 0.001
-tracks/0/type = "value"
-tracks/0/path = NodePath("BesourinhoUltra4k:visible")
-tracks/0/interp = 1
-tracks/0/loop_wrap = true
-tracks/0/imported = false
-tracks/0/enabled = true
-tracks/0/keys = {
-"times": PoolRealArray( 0 ),
-"transitions": PoolRealArray( 1 ),
-"update": 0,
-"values": [ false ]
-}
-tracks/1/type = "value"
-tracks/1/path = NodePath("BesourinhoUltra4k2:visible")
-tracks/1/interp = 1
-tracks/1/loop_wrap = true
-tracks/1/imported = false
-tracks/1/enabled = true
-tracks/1/keys = {
-"times": PoolRealArray( 0 ),
-"transitions": PoolRealArray( 1 ),
-"update": 0,
-"values": [ true ]
-}
-tracks/2/type = "value"
-tracks/2/path = NodePath("BesourinhoUltra4k2:position")
-tracks/2/interp = 1
-tracks/2/loop_wrap = true
-tracks/2/imported = false
-tracks/2/enabled = true
-tracks/2/keys = {
-"times": PoolRealArray( 0 ),
-"transitions": PoolRealArray( 1 ),
-"update": 0,
-"values": [ Vector2( 384, 613 ) ]
-}
-tracks/3/type = "value"
-tracks/3/path = NodePath("BesourinhoUltra4k2:rotation_degrees")
-tracks/3/interp = 1
-tracks/3/loop_wrap = true
-tracks/3/imported = false
-tracks/3/enabled = true
-tracks/3/keys = {
-"times": PoolRealArray( 0 ),
-"transitions": PoolRealArray( 1 ),
-"update": 0,
-"values": [ 0.0 ]
-}
+
+[sub_resource type="SpriteFrames" id=23]
+animations = [ {
+"frames": [ ExtResource( 30 ), ExtResource( 27 ), ExtResource( 26 ), ExtResource( 28 ) ],
+"loop": true,
+"name": "default",
+"speed": 5.0
+}, {
+"frames": [ ExtResource( 31 ), ExtResource( 32 ), ExtResource( 33 ), ExtResource( 29 ) ],
+"loop": true,
+"name": "New Anim",
+"speed": 5.0
+} ]
 
 [node name="main" type="YSort"]
 position = Vector2( 2, 0 )
@@ -696,7 +674,9 @@ autoplay = true
 pause_mode = 2
 script = ExtResource( 20 )
 
-[node name="TextureButton3" type="Sprite" parent="PauseMenu"]
+[node name="play" type="Node2D" parent="PauseMenu"]
+
+[node name="TextureButton3" type="Sprite" parent="PauseMenu/play"]
 material = SubResource( 13 )
 z_index = -255
 texture = ExtResource( 15 )
@@ -704,52 +684,57 @@ centered = false
 region_enabled = true
 region_rect = Rect2( 0, 0, 540, 960 )
 
-[node name="Logo" type="Sprite" parent="PauseMenu"]
+[node name="Logo" type="Sprite" parent="PauseMenu/play"]
 position = Vector2( 267, 162 )
 texture = ExtResource( 18 )
 
-[node name="BesourinhoUltra4k" type="AnimatedSprite" parent="PauseMenu"]
+[node name="BesourinhoUltra4k" type="AnimatedSprite" parent="PauseMenu/play"]
 visible = false
 position = Vector2( 434, 819 )
 rotation = -0.561978
 z_index = 20
 frames = SubResource( 17 )
-frame = 12
+frame = 11
 playing = true
 
-[node name="Play" type="TouchScreenButton" parent="PauseMenu"]
-position = Vector2( -2, 697 )
+[node name="Play" type="TouchScreenButton" parent="PauseMenu/play"]
+position = Vector2( 60, 740 )
 normal = ExtResource( 19 )
 
-[node name="BesourinhoUltra4k2" type="Sprite" parent="PauseMenu"]
-position = Vector2( 384, 613 )
+[node name="howto" type="TouchScreenButton" parent="PauseMenu/play"]
+position = Vector2( 150, 624 )
+normal = ExtResource( 21 )
+
+[node name="BesourinhoUltra4k2" type="Sprite" parent="PauseMenu/play"]
+position = Vector2( 462, 1133 )
+rotation = 0.285841
 z_index = 20
 texture = ExtResource( 17 )
 region_enabled = true
 region_rect = Rect2( 35.4951, -1.51037, 78.6197, 152.539 )
 
-[node name="BesourinhoUltra4k3" type="Sprite" parent="PauseMenu/BesourinhoUltra4k2"]
+[node name="BesourinhoUltra4k3" type="Sprite" parent="PauseMenu/play/BesourinhoUltra4k2"]
 position = Vector2( -33, -24 )
 texture = ExtResource( 17 )
 offset = Vector2( -17, -22 )
 region_enabled = true
 region_rect = Rect2( 6.85741, 1.01094, 34.8782, 55.8891 )
 
-[node name="BesourinhoUltra4k4" type="Sprite" parent="PauseMenu/BesourinhoUltra4k2"]
+[node name="BesourinhoUltra4k4" type="Sprite" parent="PauseMenu/play/BesourinhoUltra4k2"]
 position = Vector2( -38, 4 )
 texture = ExtResource( 17 )
 offset = Vector2( -19, 8 )
 region_enabled = true
 region_rect = Rect2( -4.90872, 69.5066, 40.7612, 39.0803 )
 
-[node name="BesourinhoUltra4k5" type="Sprite" parent="PauseMenu/BesourinhoUltra4k2"]
+[node name="BesourinhoUltra4k5" type="Sprite" parent="PauseMenu/play/BesourinhoUltra4k2"]
 position = Vector2( -39, 42 )
 texture = ExtResource( 17 )
 offset = Vector2( -12, 15 )
 region_enabled = true
 region_rect = Rect2( 9.37872, 111.949, 27.7344, 43.7028 )
 
-[node name="BesourinhoUltra4k6" type="Sprite" parent="PauseMenu/BesourinhoUltra4k2"]
+[node name="BesourinhoUltra4k6" type="Sprite" parent="PauseMenu/play/BesourinhoUltra4k2"]
 position = Vector2( 33, -24 )
 scale = Vector2( -1, 1 )
 texture = ExtResource( 17 )
@@ -757,7 +742,7 @@ offset = Vector2( -17, -22 )
 region_enabled = true
 region_rect = Rect2( 6.85741, 1.01094, 34.8782, 55.8891 )
 
-[node name="BesourinhoUltra4k7" type="Sprite" parent="PauseMenu/BesourinhoUltra4k2"]
+[node name="BesourinhoUltra4k7" type="Sprite" parent="PauseMenu/play/BesourinhoUltra4k2"]
 position = Vector2( 38, 4 )
 scale = Vector2( -1, 1 )
 texture = ExtResource( 17 )
@@ -765,7 +750,7 @@ offset = Vector2( -19, 8 )
 region_enabled = true
 region_rect = Rect2( -4.90872, 69.5066, 40.7612, 39.0803 )
 
-[node name="BesourinhoUltra4k8" type="Sprite" parent="PauseMenu/BesourinhoUltra4k2"]
+[node name="BesourinhoUltra4k8" type="Sprite" parent="PauseMenu/play/BesourinhoUltra4k2"]
 position = Vector2( 38.5, 42 )
 scale = Vector2( -1, 1 )
 texture = ExtResource( 17 )
@@ -773,19 +758,60 @@ offset = Vector2( -12, 15 )
 region_enabled = true
 region_rect = Rect2( 9.37872, 111.949, 27.7344, 43.7028 )
 
-[node name="AnimationPlayer" type="AnimationPlayer" parent="PauseMenu/BesourinhoUltra4k2"]
+[node name="AnimationPlayer" type="AnimationPlayer" parent="PauseMenu/play/BesourinhoUltra4k2"]
 pause_mode = 2
 "anims/Nova Animação" = SubResource( 21 )
 anims/RESET = SubResource( 22 )
 
-[node name="AnimationPlayer2" type="AnimationPlayer" parent="PauseMenu/BesourinhoUltra4k2"]
+[node name="AnimationPlayer2" type="AnimationPlayer" parent="PauseMenu/play/BesourinhoUltra4k2"]
 pause_mode = 2
-root_node = NodePath("../..")
+root_node = NodePath("../../..")
 autoplay = "Nova Animação"
 "anims/Nova Animação" = SubResource( 18 )
 anims/RESET = SubResource( 19 )
 
 [node name="Tutorial" type="CanvasLayer" parent="."]
+pause_mode = 2
+script = ExtResource( 22 )
+playnode = NodePath("../PauseMenu/play")
+
+[node name="tut" type="Node2D" parent="Tutorial"]
+visible = false
+
+[node name="TextureButton4" type="Sprite" parent="Tutorial/tut"]
+material = SubResource( 13 )
+z_index = -255
+texture = ExtResource( 15 )
+centered = false
+region_enabled = true
+region_rect = Rect2( 0, 0, 540, 960 )
+
+[node name="back" type="TouchScreenButton" parent="Tutorial/tut"]
+pause_mode = 2
+position = Vector2( 0, 599 )
+normal = ExtResource( 23 )
+
+[node name="arrows" type="TouchScreenButton" parent="Tutorial/tut"]
+position = Vector2( 270, 775 )
+normal = ExtResource( 25 )
+
+[node name="arrows2" type="TouchScreenButton" parent="Tutorial/tut"]
+position = Vector2( 270, 775 )
+scale = Vector2( -1, 1 )
+normal = ExtResource( 25 )
+
+[node name="TutBg" type="Sprite" parent="Tutorial/tut"]
+texture = ExtResource( 24 )
+centered = false
+
+[node name="AnimatedSprite" type="AnimatedSprite" parent="Tutorial/tut"]
+frames = SubResource( 23 )
+animation = "New Anim"
+centered = false
+
+[node name="AnimatedSprite2" type="AnimatedSprite" parent="Tutorial/tut"]
+frames = SubResource( 23 )
+centered = false
 
 [connection signal="dieproxy" from="bacteria" to="restarter" method="_on_bacteria_dieproxy"]
 [connection signal="level_up" from="bacteria" to="PowerUpControl" method="_on_bacteria_level_up"]
@@ -794,4 +820,8 @@ anims/RESET = SubResource( 19 )
 [connection signal="item_activated" from="PowerUpControl/Control2/VSeparator/ItemList" to="PowerUpControl" method="_on_ItemList_item_activated"]
 [connection signal="button_down" from="PowerUpControl/Control2/VSeparator/Button" to="PowerUpControl" method="_on_Button_button_down"]
 [connection signal="button_down" from="PowerUpControl/Control2/VSeparator/Button" to="PowerUpControl/AudioStreamPlayer" method="play"]
-[connection signal="pressed" from="PauseMenu/Play" to="PauseMenu" method="_on_Play_pressed"]
+[connection signal="pressed" from="PauseMenu/play/Play" to="PauseMenu" method="_on_Play_pressed"]
+[connection signal="pressed" from="PauseMenu/play/howto" to="Tutorial" method="_on_howto_pressed"]
+[connection signal="pressed" from="Tutorial/tut/back" to="Tutorial" method="_on_back_pressed"]
+[connection signal="pressed" from="Tutorial/tut/arrows" to="Tutorial" method="_on_arrows_pressed"]
+[connection signal="pressed" from="Tutorial/tut/arrows2" to="Tutorial" method="_on_arrows2_pressed"]

+ 5 - 2
mainmenu.gd

@@ -20,6 +20,9 @@ func _ready():
 func _on_Play_pressed():
 	get_tree().paused = false
 	for x in get_children():x.visible = false
-	$BesourinhoUltra4k2/AnimationPlayer.stop()
-	$BesourinhoUltra4k2/AnimationPlayer2.stop()
+	$play/BesourinhoUltra4k2/AnimationPlayer.stop()
+	$play/BesourinhoUltra4k2/AnimationPlayer2.stop()
 	pass # Replace with function body.
+
+
+

+ 26 - 1
powerups.gd

@@ -15,6 +15,7 @@ var menbros = {
 		'upgrade': {'dmg':0.15},
 		'level':1,
 		'data' : [[0,0], [0,0], [0,0]] , 'name':'braco_bruto',
+		'description':'',
 		'icone':load("res://sprite/IconesMembros/BracoBruto.png"),
 	},
 	'menbro_chicote':{
@@ -25,6 +26,7 @@ var menbros = {
 		'upgrade': {'atkspeed':0.1,'range':0.05},
 		'level':1,
 		'data' : [[0,0], [0,0], [0,0]] , 'name':'menbro_chicote',
+		'description':'',
 		'icone':load("res://sprite/IconesMembros/MembroChicote.png"),
 	},
 	'pernas_ligeiras':{
@@ -34,6 +36,7 @@ var menbros = {
 		'upgrade': {'speed':0.2},
 		'level':1,
 		'data' : [[0,0], [0,0], [0,0]] , 'name':'pernas_ligeiras',
+		'description':'',
 		'icone':load("res://sprite/IconesMembros/PernasLigeiras.png"),
 	},
 	'o_corredor':{
@@ -44,6 +47,7 @@ var menbros = {
 		'upgrade': {'speed':0.2},
 		'level':1,
 		'data' : [[0,0], [0,0], [0,0]] , 'name':'o_corredor',
+		'description':'',
 		'icone':load("res://sprite/IconesMembros/OCorredor.png"),
 	},
 	'coxas_robustas':{
@@ -53,6 +57,7 @@ var menbros = {
 		'upgrade': {'speed':0.1, 'hp':0.1},
 		'level':1,
 		'data' : [[0,0], [0,0], [0,0]] , 'name':'coxas_robustas',
+		'description':'',
 		'icone':load("res://sprite/IconesMembros/CoxasRobustas.png"),
 	},
 	'patas_encourasadas':{
@@ -62,6 +67,7 @@ var menbros = {
 		'upgrade': {'hp':0.2},
 		'level':1,
 		'data' : [[0,0], [0,0], [0,0]] , 'name':'patas_encourasadas',
+		'description':'',
 		'icone':load("res://sprite/IconesMembros/PatasEncouracadas.png"),
 	},
 	'tentaculos_espinhosos':{
@@ -72,6 +78,7 @@ var menbros = {
 		'upgrade': {'hp':0.1, 'dmg':0.1},
 		'level':1,
 		'data' : [[0,0], [0,0], [0,0]] , 'name':'tentaculos_espinhosos',
+		'description':'',
 		'icone':load("res://sprite/IconesMembros/TentaculoEspinhoso.png"),
 	},
 	'patas_perigosas':{
@@ -80,6 +87,7 @@ var menbros = {
 		'upgrade': {'dmg':0.2},
 		'level':1,
 		'data' : [[0,0], [0,0], [0,0]] , 'name':'patas_perigosas',
+		'description':'',
 		'icone':load("res://sprite/IconesMembros/PatasPerigossas.png"),
 	},
 	'garras_galantes':{
@@ -89,6 +97,7 @@ var menbros = {
 		'upgrade': {'hp':0.1, 'dmg':0.1},
 		'level':1,
 		'data' : [[0,0], [0,0], [0,0]] , 'name':'garras_galantes',
+		'description':'',
 		'icone':load("res://sprite/IconesMembros/GarrasGalantes.png"),
 	},
 	'cutucao_relampago':{
@@ -99,6 +108,7 @@ var menbros = {
 		'upgrade': {'atkspeed':0.15},
 		'level':1,
 		'data' : [[0,0], [0,0], [0,0]] , 'name':'cutucao_relampago',
+		'description':'',
 		'icone':load("res://sprite/IconesMembros/CutucaoRelampago.png"),
 	},
 	'braco_arremesador':{
@@ -109,6 +119,7 @@ var menbros = {
 		'upgrade': {'dmg': 0.05, 'range': 0.1},
 		'level':1,
 		'data' : [[0,0], [0,0], [0,0]] , 'name':'braco_arremesador',
+		'description':'',
 		'icone':load("res://sprite/IconesMembros/BracoArremssador.png"),
 	},
 	'membro_espigao':{
@@ -119,6 +130,7 @@ var menbros = {
 		'upgrade': {'atkspeed': 0.05, 'dmg': 0.05, 'range': 0.05},
 		'level':1,
 		'data' : [[0,0], [0,0], [0,0]] , 'name':'membro_espigao',
+		'description':'',
 		'icone':load("res://sprite/IconesMembros/MembroEspigao.png"),
 	}
 }
@@ -132,6 +144,7 @@ var corpo = {
 		'upgrade': {'hp':0.1},
 		'level':1,
 		'data' : [[0,0], [0,0], [0,0]] , 'name':'carapaca_firme',
+		'description':'',
 		'icone':load("res://sprite/IconesCorpo/CarapacaFirme.png"),
 	},
 	'metabolismo_avancado':{
@@ -140,6 +153,7 @@ var corpo = {
 		'upgrade': {'regen_time':-1.0},
 		'level':1,
 		'data' : [[0,0], [0,0], [0,0]] , 'name':'metabolismo_avancado',
+		'description':'',
 		'icone':load("res://sprite/IconesCorpo/MetabolismoAvancado.png"),
 	},
 	'cerebro_avantajado':{
@@ -147,6 +161,7 @@ var corpo = {
 		'upgrade': {'xpmult':0.05},
 		'level':1,
 		'data' : [[0,0], [0,0], [0,0]] , 'name':'cerebro_avantajado',
+		'description':'',
 		'icone':load("res://sprite/IconesCorpo/CerebroAvantajado.png"),
 	},
 	'escama_reflexiva':{
@@ -154,6 +169,7 @@ var corpo = {
 		'upgrade': {'react_dmg':0.2},
 		'level':1,
 		'data' : [[0,0], [0,0], [0,0]] , 'name':'escama_reflexiva',
+		'description':'',
 		'icone':load("res://sprite/IconesCorpo/EscudoReflexivo.png"),
 	},
 	'esqueleto_metalico':{
@@ -162,6 +178,7 @@ var corpo = {
 		'upgrade': {'hp':0.2},
 		'level':1,
 		'data' : [[0,0], [0,0], [0,0]] , 'name':'esqueleto_metalico',
+		'description':'',
 		'icone':load("res://sprite/IconesCorpo/EsqueletoMetalico.png"),
 	},
 	'esqueleto_oco':{
@@ -170,6 +187,7 @@ var corpo = {
 		'upgrade': {'speed':0.2},
 		'level':1,
 		'data' : [[0,0], [0,0], [0,0]] , 'name':'esqueleto_oco',
+		'description':'',
 		'icone':load("res://sprite/IconesCorpo/EsqueletoOco.png"),
 	},
 	'corpo_aerodinamico':{
@@ -177,6 +195,7 @@ var corpo = {
 		'upgrade': {'speed':0.2},
 		'level':1,
 		'data' : [[0,0], [0,0], [0,0]] , 'name':'corpo_aerodinamico',
+		'description':'',
 		'icone':load("res://sprite/IconesCorpo/CorpoAerodinamico.png"),
 	},
 	'pernas_farpadas':{
@@ -184,6 +203,7 @@ var corpo = {
 		'upgrade': {'atkspeed':0.04},
 		'level':1,
 		'data' : [[0,0], [0,0], [0,0]] , 'name':'pernas_farpadas',
+		'description':'',
 		'icone':load("res://sprite/IconesCorpo/PenasEnfarpadas.png"),
 	},
 	'estomago_duplo':{
@@ -191,6 +211,7 @@ var corpo = {
 		'upgrade': {'hppickup':0.1},
 		'level':1,
 		'data' : [[0,0], [0,0], [0,0]] , 'name':'estomago_duplo',
+		'description':'',
 		'icone':load("res://sprite/IconesCorpo/EstomagoDuplo.png"),
 	},
 	'carapa_instantanea':{
@@ -199,6 +220,7 @@ var corpo = {
 		'upgrade': {'invunerabilitychance':0.3, 'invunerability':0.5},
 		'level':1,
 		'data' : [[0,0], [0,0], [0,0]] , 'name':'carapa_instantanea',
+		'description':'',
 		'icone':load("res://sprite/IconesCorpo/CarapacaInstantanea.png"),
 	},
 	'mordida_vampirica':{
@@ -207,6 +229,7 @@ var corpo = {
 		'upgrade': {'stealhp': 0.02,'hpsteal' : 0.01,},
 		'level':1,
 		'data' : [[0,0], [0,0], [0,0]] , 'name':'mordida_vampirica',
+		'description':'',
 		'icone':load("res://sprite/IconesCorpo/MordidaVampirica.png"),
 	},
 #	'olhos_admirantes':{
@@ -221,6 +244,7 @@ var corpo = {
 		'upgrade': {},
 		'level':1,
 		'data' : [[0,0], [0,0], [0,0]] , 'name':'instinto_esquivador',
+		'description':'',
 		'icone':load("res://sprite/IconesCorpo/InstintoEsquivador.png"),
 	},
 	'espora_critica':{
@@ -229,13 +253,14 @@ var corpo = {
 		'upgrade': {},
 		'level':1,
 		'data' : [[0,0], [0,0], [0,0]] , 'name':'espora_critica',
+		'description':'',
 		'icone':load("res://sprite/IconesCorpo/EsporaCritica.png"),
 	},
 }
 
 var apendice = {
 	'null':{
-		'data' : [[0,0], [0,0], [0,0]] , 'name':'null',
+		'data' : [[0,0], [0,0], [0,0]] , 'name':'null', 'description':'',
 	},
 }
 

+ 26 - 15
ui/Button.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=19 format=2]
+[gd_scene load_steps=23 format=2]
 
 [ext_resource path="res://ui/TouchScreenButton.gd" type="Script" id=1]
 [ext_resource path="res://icon.png" type="Texture" id=2]
@@ -9,29 +9,33 @@
 [ext_resource path="res://sprite/symbols/icons/speed.PNG" type="Texture" id=7]
 [ext_resource path="res://sprite/symbols/icons/swordred.PNG" type="Texture" id=8]
 [ext_resource path="res://sprite/symbols/icons/range.PNG" type="Texture" id=9]
-[ext_resource path="res://sprite/symbols/icons/star1.PNG" type="Texture" id=10]
-[ext_resource path="res://sprite/symbols/icons/star2.PNG" type="Texture" id=11]
-[ext_resource path="res://sprite/symbols/icons/star3.PNG" type="Texture" id=12]
-[ext_resource path="res://sprite/symbols/icons/star4.PNG" type="Texture" id=13]
+[ext_resource path="res://sprite/symbols/icons/icons/2Estrelas.PNG" type="Texture" id=10]
+[ext_resource path="res://sprite/symbols/icons/icons/5Estrelas.PNG" type="Texture" id=11]
+[ext_resource path="res://sprite/symbols/icons/icons/6Estrelas.PNG" type="Texture" id=12]
+[ext_resource path="res://sprite/symbols/icons/icons/7Estrelas.PNG" type="Texture" id=13]
 [ext_resource path="res://sprite/symbols/icons/starbase.PNG" type="Texture" id=14]
-[ext_resource path="res://sprite/symbols/icons/icons.png" type="Texture" id=15]
+[ext_resource path="res://sprite/symbols/icons/attackspeed.png" type="Texture" id=15]
 [ext_resource path="res://sprite/symbols/icons/swordpurple.PNG" type="Texture" id=16]
+[ext_resource path="res://sprite/symbols/icons/icons/8Estrelas.PNG" type="Texture" id=17]
+[ext_resource path="res://sprite/symbols/icons/icons/4Estrelas.PNG" type="Texture" id=18]
+[ext_resource path="res://sprite/symbols/icons/icons/3Estrelas.PNG" type="Texture" id=19]
+[ext_resource path="res://sprite/symbols/icons/icons/1Estrela.PNG" type="Texture" id=20]
 
 [sub_resource type="SpriteFrames" id=2]
 animations = [ {
-"frames": [ ExtResource( 6 ), ExtResource( 9 ), ExtResource( 7 ), ExtResource( 8 ), ExtResource( 16 ) ],
+"frames": [ ExtResource( 6 ), ExtResource( 9 ), ExtResource( 7 ), ExtResource( 8 ), ExtResource( 16 ), ExtResource( 15 ) ],
 "loop": true,
 "name": "default",
 "speed": 5.0
 }, {
-"frames": [ ExtResource( 14 ) ],
+"frames": [ ExtResource( 20 ), ExtResource( 10 ), ExtResource( 19 ), ExtResource( 18 ), ExtResource( 11 ), ExtResource( 12 ), ExtResource( 13 ), ExtResource( 17 ) ],
 "loop": true,
-"name": "starbase",
+"name": "stars",
 "speed": 5.0
 }, {
-"frames": [ ExtResource( 15 ), ExtResource( 10 ), ExtResource( 11 ), ExtResource( 12 ), ExtResource( 13 ) ],
+"frames": [ ExtResource( 14 ) ],
 "loop": true,
-"name": "stars",
+"name": "starbase",
 "speed": 5.0
 } ]
 
@@ -48,20 +52,24 @@ flat = true
 
 [node name="Label" type="Label" parent="."]
 margin_left = -275.0
-margin_top = 1.0
+margin_top = -1.0
 margin_right = -6.0
-margin_bottom = 61.0
+margin_bottom = 63.0
 custom_fonts/font = ExtResource( 4 )
 text = "stuff"
 align = 1
 valign = 2
 
+[node name="Label" type="Label" parent="Label"]
+anchor_right = 1.0
+anchor_bottom = 1.0
+custom_fonts/font = ExtResource( 4 )
+align = 1
+
 [node name="ColorRect" type="ColorRect" parent="Label"]
 show_behind_parent = true
 anchor_right = 1.0
 anchor_bottom = 1.0
-margin_right = 6.0
-margin_bottom = -4.0
 color = Color( 0, 0, 0, 0.321569 )
 
 [node name="icons" type="Node2D" parent="Label"]
@@ -73,6 +81,7 @@ position = Vector2( 27.5, 21.5 )
 frames = SubResource( 2 )
 
 [node name="starsback" type="AnimatedSprite" parent="Label/icons/icon1"]
+visible = false
 position = Vector2( 51, 0 )
 frames = SubResource( 2 )
 animation = "starbase"
@@ -88,6 +97,7 @@ frames = SubResource( 2 )
 frame = 1
 
 [node name="starsback" type="AnimatedSprite" parent="Label/icons/icon2"]
+visible = false
 position = Vector2( 51, 0 )
 frames = SubResource( 2 )
 animation = "starbase"
@@ -103,6 +113,7 @@ frames = SubResource( 2 )
 frame = 2
 
 [node name="starsback" type="AnimatedSprite" parent="Label/icons/icon3"]
+visible = false
 position = Vector2( 51, 0 )
 frames = SubResource( 2 )
 animation = "starbase"

+ 4 - 0
ui/TouchScreenButton.gd

@@ -20,6 +20,10 @@ func _processUI(dict = [[0,0], [0,0], [0,0]]):
 	$Label/icons/icon3.frame = dict[2][0]
 	$Label/icons/icon3/stars.frame = dict[2][1]
 
+func _description(arg = ''):
+	$Label/Label.text = arg
+	$Label/icons.visible = arg == ''
+
 func _physics_process(delta):
 	$Label.text = text
 	$Label.show()