bunch of fixes based on feedback, adding changelog

.import/icons.png-301dd626b11151914b6232db2dbcc71d.md5

@@ -0,0 +1,3 @@
+source_md5="4ef57950d5dceb835b2b6313d472283c"
+dest_md5="4aae41770a9e464272dfdb1ba5ec6cb9"
+

main.tscn

@@ -506,7 +506,7 @@ scale = Vector2( 0.75, 0.75 )
 texture = ExtResource( 11 )
 
 [node name="menbros" type="Node2D" parent="PowerUpControl/Control2/VSeparator"]
-self_modulate = Color( 0, 1, 0.952941, 1 )
+self_modulate = Color( 1, 0.494118, 0, 1 )
 position = Vector2( 186, 293 )
 scale = Vector2( 0.75, 0.75 )
 
@@ -581,7 +581,7 @@ position = Vector2( 32, 32 )
 shape = SubResource( 3 )
 
 [node name="corpo" type="Node2D" parent="PowerUpControl/Control2/VSeparator"]
-self_modulate = Color( 1, 0.494118, 0, 1 )
+self_modulate = Color( 0, 1, 0.952941, 1 )
 position = Vector2( 186, 293 )
 scale = Vector2( 0.75, 0.75 )
 
@@ -714,7 +714,7 @@ position = Vector2( 434, 819 )
 rotation = -0.561978
 z_index = 20
 frames = SubResource( 17 )
-frame = 5
+frame = 9
 playing = true
 
 [node name="Play" type="TouchScreenButton" parent="PauseMenu"]

powerups.gd

@@ -5,7 +5,7 @@ extends Node
 var menbros = {
 	'null':{
 		'img':null,
-		'name':'test : null',
+		'name':'null',
 	},
 	'braco_bruto':{
 		'img':load("res://sprite/menbros/BracoBruto.png"),
@@ -14,7 +14,7 @@ var menbros = {
 		'atkspeed':1.0,
 		'upgrade': {'dmg':0.15},
 		'level':1,
-		'name':'test : braco_bruto',
+		'name':'braco_bruto',
 		'icone':load("res://sprite/IconesMembros/BracoBruto.png"),
 	},
 	'menbro_chicote':{
@@ -24,7 +24,7 @@ var menbros = {
 		'atkspeed':1.25,
 		'upgrade': {'atkspeed':0.1,'range':0.05},
 		'level':1,
-		'name':'test : menbro_chicote',
+		'name':'menbro_chicote',
 		'icone':load("res://sprite/IconesMembros/MembroChicote.png"),
 	},
 	'pernas_ligeiras':{
@@ -33,7 +33,7 @@ var menbros = {
 		'speed':1.75,
 		'upgrade': {'speed':0.2},
 		'level':1,
-		'name':'test : pernas_ligeiras',
+		'name':'pernas_ligeiras',
 		'icone':load("res://sprite/IconesMembros/PernasLigeiras.png"),
 	},
 	'o_corredor':{
@@ -43,7 +43,7 @@ var menbros = {
 		'speed':2.0,
 		'upgrade': {'speed':0.2},
 		'level':1,
-		'name':'test : o_corredor',
+		'name':'o_corredor',
 		'icone':load("res://sprite/IconesMembros/OCorredor.png"),
 	},
 	'coxas_robustas':{
@@ -52,7 +52,7 @@ var menbros = {
 		'speed':1.25,
 		'upgrade': {'speed':0.1, 'hp':0.1},
 		'level':1,
-		'name':'test : coxas_robustas',
+		'name':'coxas_robustas',
 		'icone':load("res://sprite/IconesMembros/CoxasRobustas.png"),
 	},
 	'patas_encourasadas':{
@@ -61,7 +61,7 @@ var menbros = {
 		'speed':0.75,
 		'upgrade': {'hp':0.2},
 		'level':1,
-		'name':'test : patas_encourasadas',
+		'name':'patas_encourasadas',
 		'icone':load("res://sprite/IconesMembros/PatasEncouracadas.png"),
 	},
 	'tentaculos_espinhosos':{
@@ -71,7 +71,7 @@ var menbros = {
 		'speed':0.5,
 		'upgrade': {'hp':0.1, 'dmg':0.1},
 		'level':1,
-		'name':'test : tentaculos_espinhosos',
+		'name':'tentaculos_espinhosos',
 		'icone':load("res://sprite/IconesMembros/TentaculoEspinhoso.png"),
 	},
 	'patas_perigosas':{
@@ -79,7 +79,7 @@ var menbros = {
 		'dmg':1.5,
 		'upgrade': {'dmg':0.2},
 		'level':1,
-		'name':'test : patas_perigosas',
+		'name':'patas_perigosas',
 		'icone':load("res://sprite/IconesMembros/PatasPerigossas.png"),
 	},
 	'garras_galantes':{
@@ -88,7 +88,7 @@ var menbros = {
 		'dmg':1.25,
 		'upgrade': {'hp':0.1, 'dmg':0.1},
 		'level':1,
-		'name':'test : garras_galantes',
+		'name':'garras_galantes',
 		'icone':load("res://sprite/IconesMembros/GarrasGalantes.png"),
 	},
 	'cutucao_relampago':{
@@ -98,7 +98,7 @@ var menbros = {
 		'dmg':0.75,
 		'upgrade': {'atkspeed':0.15},
 		'level':1,
-		'name':'test : cutucao_relampago',
+		'name':'cutucao_relampago',
 		'icone':load("res://sprite/IconesMembros/CutucaoRelampago.png"),
 	},
 	'braco_arremesador':{
@@ -108,7 +108,7 @@ var menbros = {
 		'dmg':1.0,
 		'upgrade': {'dmg': 0.05, 'range': 0.1},
 		'level':1,
-		'name':'test : braco_arremesador',
+		'name':'braco_arremesador',
 		'icone':load("res://sprite/IconesMembros/BracoArremssador.png"),
 	},
 	'membro_espigao':{
@@ -118,20 +118,20 @@ var menbros = {
 		'dmg':1.0,
 		'upgrade': {'atkspeed': 0.05, 'dmg': 0.05, 'range': 0.05},
 		'level':1,
-		'name':'test : membro_espigao',
+		'name':'membro_espigao',
 		'icone':load("res://sprite/IconesMembros/MembroEspigao.png"),
 	}
 }
 
 var corpo = {
 	'null':{
-		'name':'test : null',
+		'name':'null',
 	},
 	'carapaca_firme':{
 		'hp':1.5,
 		'upgrade': {'hp':0.1},
 		'level':1,
-		'name':'test : carapaca_firme',
+		'name':'carapaca_firme',
 		'icone':load("res://sprite/IconesCorpo/CarapacaFirme.png"),
 	},
 	'metabolismo_avancado':{
@@ -139,21 +139,21 @@ var corpo = {
 		'regen_time':7.0,
 		'upgrade': {'regen_time':-1.0},
 		'level':1,
-		'name':'test : metabolismo_avancado',
+		'name':'metabolismo_avancado',
 		'icone':load("res://sprite/IconesCorpo/MetabolismoAvancado.png"),
 	},
 	'cerebro_avantajado':{
 		'xpmult':1.25,
 		'upgrade': {'xpmult':0.05},
 		'level':1,
-		'name':'test : cerebro_avantajado',
+		'name':'cerebro_avantajado',
 		'icone':load("res://sprite/IconesCorpo/CerebroAvantajado.png"),
 	},
 	'escama_reflexiva':{
 		'react_dmg' : 1.0,
 		'upgrade': {'react_dmg':0.2},
 		'level':1,
-		'name':'test : escama_reflexiva',
+		'name':'escama_reflexiva',
 		'icone':load("res://sprite/IconesCorpo/EscudoReflexivo.png"),
 	},
 	'esqueleto_metalico':{
@@ -161,7 +161,7 @@ var corpo = {
 		'hp' : 2.0,
 		'upgrade': {'hp':0.2},
 		'level':1,
-		'name':'test : esqueleto_metalico',
+		'name':'esqueleto_metalico',
 		'icone':load("res://sprite/IconesCorpo/EsqueletoMetalico.png"),
 	},
 	'esqueleto_oco':{
@@ -169,28 +169,28 @@ var corpo = {
 		'hp' : 0.5,
 		'upgrade': {'speed':0.2},
 		'level':1,
-		'name':'test : esqueleto_oco',
+		'name':'esqueleto_oco',
 		'icone':load("res://sprite/IconesCorpo/EsqueletoOco.png"),
 	},
 	'corpo_aerodinamico':{
 		'speed' : 1.5,
 		'upgrade': {'speed':0.2},
 		'level':1,
-		'name':'test : corpo_aerodinamico',
+		'name':'corpo_aerodinamico',
 		'icone':load("res://sprite/IconesCorpo/CorpoAerodinamico.png"),
 	},
 	'pernas_farpadas':{
 		'atkspeed':1.2,
 		'upgrade': {'atkspeed':0.04},
 		'level':1,
-		'name':'test : pernas_farpadas',
+		'name':'pernas_farpadas',
 		'icone':load("res://sprite/IconesCorpo/PenasEnfarpadas.png"),
 	},
 	'estomago_duplo':{
 		'hppickup' : 1.25,
 		'upgrade': {'hppickup':0.1},
 		'level':1,
-		'name':'test : estomago_duplo',
+		'name':'estomago_duplo',
 		'icone':load("res://sprite/IconesCorpo/EstomagoDuplo.png"),
 	},
 	'carapa_instantanea':{
@@ -198,7 +198,7 @@ var corpo = {
 		'invunerabilitychance' : 1.15,
 		'upgrade': {'invunerabilitychance':0.3, 'invunerability':0.5},
 		'level':1,
-		'name':'test : carapa_instantanea',
+		'name':'carapa_instantanea',
 		'icone':load("res://sprite/IconesCorpo/CarapacaInstantanea.png"),
 	},
 	'mordida_vampirica':{
@@ -206,21 +206,21 @@ var corpo = {
 		'stealhp' : 0.1,
 		'upgrade': {'stealhp': 0.02,'hpsteal' : 0.01,},
 		'level':1,
-		'name':'test : mordida_vampirica',
+		'name':'mordida_vampirica',
 		'icone':load("res://sprite/IconesCorpo/MordidaVampirica.png"),
 	},
 #	'olhos_admirantes':{
 #		'camzoom' : 1.5,
 #		'upgrade': {},
 #		'level':1,
-#		'name':'test : olhos_admirantes',
+#		'name':'olhos_admirantes',
 #		'icone':load(),
 #	},
 	'instinto_esquivador':{
 		'invunerabilitychancemult' : 1.01,
 		'upgrade': {},
 		'level':1,
-		'name':'test : instinto_esquivador',
+		'name':'instinto_esquivador',
 		'icone':load("res://sprite/IconesCorpo/InstintoEsquivador.png"),
 	},
 	'espora_critica':{
@@ -228,14 +228,14 @@ var corpo = {
 		'critical_dmg' : 2.0,
 		'upgrade': {},
 		'level':1,
-		'name':'test : espora_critica',
+		'name':'espora_critica',
 		'icone':load("res://sprite/IconesCorpo/EsporaCritica.png"),
 	},
 }
 
 var apendice = {
 	'null':{
-		'name':'test : null',
+		'name':'null',
 	},
 }
 

sprite/symbols/icons/icons.png.import

@@ -0,0 +1,35 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/icons.png-301dd626b11151914b6232db2dbcc71d.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://sprite/symbols/icons/icons.png"
+dest_files=[ "res://.import/icons.png-301dd626b11151914b6232db2dbcc71d.stex" ]
+
+[params]
+
+compress/mode=0
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=false
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+process/normal_map_invert_y=false
+stream=false
+size_limit=0
+detect_3d=true
+svg/scale=1.0

ui/Button.tscn

@@ -1,10 +1,38 @@
-[gd_scene load_steps=7 format=2]
+[gd_scene load_steps=18 format=2]
 
 [ext_resource path="res://ui/TouchScreenButton.gd" type="Script" id=1]
 [ext_resource path="res://icon.png" type="Texture" id=2]
 [ext_resource path="res://sounds/sfx1.ogg" type="AudioStream" id=3]
 [ext_resource path="res://newdynamicfont.tres" type="DynamicFont" id=4]
 [ext_resource path="res://sounds/sfx2.ogg" type="AudioStream" id=5]
+[ext_resource path="res://sprite/symbols/icons/health.PNG" type="Texture" id=6]
+[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/starbase.PNG" type="Texture" id=14]
+[ext_resource path="res://sprite/symbols/icons/icons.png" type="Texture" id=15]
+
+[sub_resource type="SpriteFrames" id=2]
+animations = [ {
+"frames": [ ExtResource( 6 ), ExtResource( 9 ), ExtResource( 7 ), ExtResource( 8 ) ],
+"loop": true,
+"name": "default",
+"speed": 5.0
+}, {
+"frames": [ ExtResource( 14 ) ],
+"loop": true,
+"name": "starbase",
+"speed": 5.0
+}, {
+"frames": [ ExtResource( 15 ), ExtResource( 10 ), ExtResource( 11 ), ExtResource( 12 ), ExtResource( 13 ) ],
+"loop": true,
+"name": "stars",
+"speed": 5.0
+} ]
 
 [sub_resource type="RectangleShape2D" id=1]
 
@@ -25,15 +53,64 @@ margin_bottom = 61.0
 custom_fonts/font = ExtResource( 4 )
 text = "stuff"
 align = 1
-valign = 1
+valign = 2
 
 [node name="ColorRect" type="ColorRect" parent="Label"]
 show_behind_parent = true
 anchor_right = 1.0
 anchor_bottom = 1.0
-margin_right = 1.0
+margin_right = 6.0
+margin_bottom = -4.0
 color = Color( 0, 0, 0, 0.321569 )
 
+[node name="icons" type="Node2D" parent="Label"]
+position = Vector2( 1, 3 )
+scale = Vector2( 0.8, 0.8 )
+
+[node name="AnimatedSprite" type="AnimatedSprite" parent="Label/icons"]
+position = Vector2( 27.5, 21.5 )
+frames = SubResource( 2 )
+
+[node name="AnimatedSprite2" type="AnimatedSprite" parent="Label/icons/AnimatedSprite"]
+position = Vector2( 51, 0 )
+frames = SubResource( 2 )
+animation = "starbase"
+
+[node name="AnimatedSprite3" type="AnimatedSprite" parent="Label/icons/AnimatedSprite"]
+position = Vector2( 51, 0 )
+frames = SubResource( 2 )
+animation = "stars"
+
+[node name="AnimatedSprite2" type="AnimatedSprite" parent="Label/icons"]
+position = Vector2( 134.5, 21.5 )
+frames = SubResource( 2 )
+frame = 1
+
+[node name="AnimatedSprite2" type="AnimatedSprite" parent="Label/icons/AnimatedSprite2"]
+position = Vector2( 51, 0 )
+frames = SubResource( 2 )
+animation = "starbase"
+
+[node name="AnimatedSprite3" type="AnimatedSprite" parent="Label/icons/AnimatedSprite2"]
+position = Vector2( 51, 0 )
+frames = SubResource( 2 )
+animation = "stars"
+
+[node name="AnimatedSprite3" type="AnimatedSprite" parent="Label/icons"]
+position = Vector2( 238, 21.5 )
+frames = SubResource( 2 )
+frame = 2
+
+[node name="AnimatedSprite2" type="AnimatedSprite" parent="Label/icons/AnimatedSprite3"]
+position = Vector2( 51, 0 )
+frames = SubResource( 2 )
+animation = "starbase"
+
+[node name="AnimatedSprite3" type="AnimatedSprite" parent="Label/icons/AnimatedSprite3"]
+position = Vector2( 51, 0 )
+frames = SubResource( 2 )
+animation = "stars"
+
 [node name="col" type="Area2D" parent="."]
 collision_layer = 0
 collision_mask = 0