bunch of fixes based on feedback, adding changelog

.import/InterfaceLevelUpNew.png-57c9b6c02883096f39456bab90990bd3.md5

@@ -0,0 +1,3 @@
+source_md5="a5cbe681fc0ec12d761c0da2df590e58"
+dest_md5="d79ccb015e281409ac2e0a0a0d52b4f8"
+

.import/button.png-8078cadb1f4a4a2b5da3ea9be6434a03.md5

@@ -0,0 +1,3 @@
+source_md5="37600bf0f2d29ab03154d8ec18ec597e"
+dest_md5="2979b15e3630971c71cd575918e6fcfb"
+

PowerUpControl.gd

@@ -3,8 +3,7 @@ extends CanvasLayer
 func openmenu():
 	get_tree().paused = true
 	$Control.show()
-	$Control/VSeparator.show()
-	$Control/VSeparator2.hide()
+	$Control/VSeparator/Label.text = 'Choose a power:'
 	$Control/VSeparator/ItemList.clear()
 	var array = []
 	var text = Powerups.menbros.keys() + Powerups.corpo.keys() + Powerups.apendice.keys()
@@ -24,31 +23,27 @@ var power = ''
 var dict = ''
 
 func _on_ItemList_item_activated(index):
-	print(index)
-	power = $Control/VSeparator/ItemList.get_item_text(index)
-	if Powerups.menbros.has(power): dict = 'menbros'
-	if Powerups.corpo.has(power): dict = 'corpo'
-	if Powerups.apendice.has(power): dict = 'apendice'
-	$Control/VSeparator2/ItemList2.clear()
-	for x in Powerups.dictslots[dict]:
-		$Control/VSeparator2/ItemList2.add_item(Powerups.dict[dict + str(x)].name)
-	$Control/VSeparator2.show()
-	$Control/VSeparator.hide()
-	pass # Replace with function body.
-
-
-func _on_ItemList2_item_activated(index):
-	
-	print(index)
-	var dict2 = dict + str(index)
-	if Powerups.dict[dict2] == Powerups[dict][power]:
-		print('upgrading power')
-		for x in Powerups[dict][power]['upgrade'].keys():
-			 Powerups[dict][power][x] += Powerups[dict][power]['upgrade'][x]
-	Powerups.dict[dict2] = Powerups[dict][power]
-	get_parent().get_node("bacteria")._ready()
-	print(dict2)
-	print(power)
-	get_tree().paused = false
-	$Control.hide()
+	if $Control/VSeparator/Label.text == 'Choose a power:':
+		print(index)
+		power = $Control/VSeparator/ItemList.get_item_text(index)
+		if Powerups.menbros.has(power): dict = 'menbros'
+		if Powerups.corpo.has(power): dict = 'corpo'
+		if Powerups.apendice.has(power): dict = 'apendice'
+		$Control/VSeparator/ItemList.clear()
+		for x in Powerups.dictslots[dict]:
+			$Control/VSeparator/ItemList.add_item(Powerups.dict[dict + str(x)].name)
+		$Control/VSeparator/Label.text = 'put on slot:'
+	elif $Control/VSeparator/Label.text == 'put on slot:':
+		print(index)
+		var dict2 = dict + str(index)
+		if Powerups.dict[dict2] == Powerups[dict][power]:
+			print('upgrading power')
+			for x in Powerups[dict][power]['upgrade'].keys():
+				 Powerups[dict][power][x] += Powerups[dict][power]['upgrade'][x]
+		Powerups.dict[dict2] = Powerups[dict][power]
+		get_parent().get_node("bacteria")._ready()
+		print(dict2)
+		print(power)
+		get_tree().paused = false
+		$Control.hide()
 	pass # Replace with function body.

buttonsgens.gd

@@ -0,0 +1,22 @@
+extends Node2D
+
+
+# Declare member variables here. Examples:
+# var a = 2
+# var b = "text"
+var button = preload("res://ui/Button.tscn")
+
+# Called when the node enters the scene tree for the first time.
+func _ready():
+	for i in 4:
+		var button2 = button.instance()
+		add_child(button2)
+		button2.initpos = global_position
+		button2.initpos.y += i * 72
+		button2.initpos.x += 270
+	pass # Replace with function body.
+
+
+# Called every frame. 'delta' is the elapsed time since the previous frame.
+#func _process(delta):
+#	pass

main.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=17 format=2]
+[gd_scene load_steps=21 format=2]
 
 [ext_resource path="res://spawner.gd" type="Script" id=1]
 [ext_resource path="res://bacteria.tscn" type="PackedScene" id=2]
@@ -7,6 +7,9 @@
 [ext_resource path="res://PowerUpControl.gd" type="Script" id=5]
 [ext_resource path="res://font/ComfortaaRegular.ttf" type="DynamicFontData" id=6]
 [ext_resource path="res://newdynamicfont.tres" type="DynamicFont" id=7]
+[ext_resource path="res://buttonsgens.gd" type="Script" id=8]
+[ext_resource path="res://ui/InterfaceLevelUpNew.png" type="Texture" id=11]
+[ext_resource path="res://ui/Area2D2.gd" type="Script" id=12]
 
 [sub_resource type="DynamicFont" id=8]
 font_data = ExtResource( 6 )
@@ -14,6 +17,9 @@ font_data = ExtResource( 6 )
 [sub_resource type="Theme" id=9]
 default_font = SubResource( 8 )
 
+[sub_resource type="CircleShape2D" id=11]
+radius = 20.0
+
 [sub_resource type="Shader" id=1]
 code = "// NOTE: Shader automatically converted from Godot Engine 3.4.4.stable's CanvasItemMaterial.
 
@@ -135,26 +141,191 @@ rect_min_size = Vector2( 0, 120 )
 custom_fonts/font = ExtResource( 7 )
 items = [ "Item 0", null, false, "Item 1", null, false, "Item 2", null, false, "Item 3", null, false, "Item 4", null, false ]
 
-[node name="VSeparator2" type="VBoxContainer" parent="PowerUpControl/Control"]
-margin_right = 300.0
+[node name="Control2" type="MarginContainer" parent="PowerUpControl"]
+pause_mode = 2
+visible = false
+anchor_right = 1.0
+anchor_bottom = 1.0
+margin_left = 80.0
+margin_right = -80.0
+theme = SubResource( 9 )
+
+[node name="VSeparator" type="VBoxContainer" parent="PowerUpControl/Control2"]
+margin_right = 380.0
 margin_bottom = 960.0
 theme = SubResource( 9 )
 alignment = 1
 
-[node name="Label" type="Label" parent="PowerUpControl/Control/VSeparator2"]
-margin_top = 408.0
-margin_right = 300.0
-margin_bottom = 427.0
+[node name="Label" type="Label" parent="PowerUpControl/Control2/VSeparator"]
+margin_top = 168.0
+margin_right = 380.0
+margin_bottom = 187.0
 custom_fonts/font = ExtResource( 7 )
-text = "put on slot:"
+text = "Choose a power:"
 
-[node name="ItemList2" type="ItemList" parent="PowerUpControl/Control/VSeparator2"]
+[node name="ItemList" type="ItemList" parent="PowerUpControl/Control2/VSeparator"]
+visible = false
 margin_top = 431.0
 margin_right = 300.0
 margin_bottom = 551.0
 rect_min_size = Vector2( 0, 120 )
 custom_fonts/font = ExtResource( 7 )
-items = [ "Item 0", null, false, "Item 1", null, false, "Item 2", null, false ]
+items = [ "Item 0", null, false, "Item 1", null, false, "Item 2", null, false, "Item 3", null, false, "Item 4", null, false ]
+
+[node name="ColorRect" type="ColorRect" parent="PowerUpControl/Control2/VSeparator"]
+margin_top = 191.0
+margin_right = 380.0
+margin_bottom = 791.0
+rect_min_size = Vector2( 0, 600 )
+color = Color( 0.886275, 0.717647, 0.556863, 1 )
+
+[node name="InterfaceLevelUpNew" type="Sprite" parent="PowerUpControl/Control2/VSeparator/ColorRect"]
+position = Vector2( 186, 117 )
+scale = Vector2( 0.75, 0.75 )
+texture = ExtResource( 11 )
+
+[node name="menbros" type="Node2D" parent="PowerUpControl/Control2/VSeparator"]
+modulate = Color( 0, 1, 0.952941, 1 )
+position = Vector2( 186, 308 )
+scale = Vector2( 0.75, 0.75 )
+
+[node name="Area2D2" type="Area2D" parent="PowerUpControl/Control2/VSeparator/menbros"]
+position = Vector2( -177.333, 36 )
+scale = Vector2( 1.33333, 1.33333 )
+collision_layer = 4
+collision_mask = 4
+script = ExtResource( 12 )
+
+[node name="CollisionShape2D" type="CollisionShape2D" parent="PowerUpControl/Control2/VSeparator/menbros/Area2D2"]
+position = Vector2( 32, 32 )
+shape = SubResource( 11 )
+
+[node name="Area2D3" type="Area2D" parent="PowerUpControl/Control2/VSeparator/menbros"]
+position = Vector2( -177.333, -120 )
+scale = Vector2( 1.33333, 1.33333 )
+collision_layer = 4
+collision_mask = 4
+script = ExtResource( 12 )
+
+[node name="CollisionShape2D" type="CollisionShape2D" parent="PowerUpControl/Control2/VSeparator/menbros/Area2D3"]
+position = Vector2( 32, 32 )
+shape = SubResource( 11 )
+
+[node name="Area2D6" type="Area2D" parent="PowerUpControl/Control2/VSeparator/menbros"]
+position = Vector2( -74.6667, 54.6667 )
+scale = Vector2( 1.33333, 1.33333 )
+collision_layer = 4
+collision_mask = 4
+script = ExtResource( 12 )
+id = 1
+
+[node name="CollisionShape2D" type="CollisionShape2D" parent="PowerUpControl/Control2/VSeparator/menbros/Area2D6"]
+position = Vector2( 32, 32 )
+shape = SubResource( 11 )
+
+[node name="Area2D7" type="Area2D" parent="PowerUpControl/Control2/VSeparator/menbros"]
+position = Vector2( -74.6667, -141.333 )
+scale = Vector2( 1.33333, 1.33333 )
+collision_layer = 4
+collision_mask = 4
+script = ExtResource( 12 )
+id = 1
+
+[node name="CollisionShape2D" type="CollisionShape2D" parent="PowerUpControl/Control2/VSeparator/menbros/Area2D7"]
+position = Vector2( 32, 32 )
+shape = SubResource( 11 )
+
+[node name="Area2D4" type="Area2D" parent="PowerUpControl/Control2/VSeparator/menbros"]
+position = Vector2( 22.6667, 36 )
+scale = Vector2( 1.33333, 1.33333 )
+collision_layer = 4
+collision_mask = 4
+script = ExtResource( 12 )
+id = 2
+
+[node name="CollisionShape2D" type="CollisionShape2D" parent="PowerUpControl/Control2/VSeparator/menbros/Area2D4"]
+position = Vector2( 32, 32 )
+shape = SubResource( 11 )
+
+[node name="Area2D5" type="Area2D" parent="PowerUpControl/Control2/VSeparator/menbros"]
+position = Vector2( 22.6667, -120 )
+scale = Vector2( 1.33333, 1.33333 )
+collision_layer = 4
+collision_mask = 4
+script = ExtResource( 12 )
+id = 2
+
+[node name="CollisionShape2D" type="CollisionShape2D" parent="PowerUpControl/Control2/VSeparator/menbros/Area2D5"]
+position = Vector2( 32, 32 )
+shape = SubResource( 11 )
+
+[node name="corpo" type="Node2D" parent="PowerUpControl/Control2/VSeparator"]
+modulate = Color( 1, 0.494118, 0, 1 )
+position = Vector2( 186, 308 )
+scale = Vector2( 0.75, 0.75 )
+
+[node name="Area2D8" type="Area2D" parent="PowerUpControl/Control2/VSeparator/corpo"]
+position = Vector2( -196, -42.6667 )
+scale = Vector2( 1.33333, 1.33333 )
+collision_layer = 8
+collision_mask = 8
+script = ExtResource( 12 )
+
+[node name="CollisionShape2D" type="CollisionShape2D" parent="PowerUpControl/Control2/VSeparator/corpo/Area2D8"]
+position = Vector2( 32, 32 )
+shape = SubResource( 11 )
+
+[node name="Area2D9" type="Area2D" parent="PowerUpControl/Control2/VSeparator/corpo"]
+position = Vector2( -117.333, -42.6667 )
+scale = Vector2( 1.33333, 1.33333 )
+collision_layer = 8
+collision_mask = 8
+script = ExtResource( 12 )
+id = 1
+
+[node name="CollisionShape2D" type="CollisionShape2D" parent="PowerUpControl/Control2/VSeparator/corpo/Area2D9"]
+position = Vector2( 32, 32 )
+shape = SubResource( 11 )
+
+[node name="Area2D10" type="Area2D" parent="PowerUpControl/Control2/VSeparator/corpo"]
+position = Vector2( -38.6667, -42.6667 )
+scale = Vector2( 1.33333, 1.33333 )
+collision_layer = 8
+collision_mask = 8
+script = ExtResource( 12 )
+id = 2
+
+[node name="CollisionShape2D" type="CollisionShape2D" parent="PowerUpControl/Control2/VSeparator/corpo/Area2D10"]
+position = Vector2( 32, 32 )
+shape = SubResource( 11 )
+
+[node name="Area2D11" type="Area2D" parent="PowerUpControl/Control2/VSeparator/corpo"]
+position = Vector2( 38.6667, -42.6667 )
+scale = Vector2( 1.33333, 1.33333 )
+collision_layer = 8
+collision_mask = 8
+script = ExtResource( 12 )
+id = 3
+
+[node name="CollisionShape2D" type="CollisionShape2D" parent="PowerUpControl/Control2/VSeparator/corpo/Area2D11"]
+position = Vector2( 32, 32 )
+shape = SubResource( 11 )
+
+[node name="Area2D12" type="Area2D" parent="PowerUpControl/Control2/VSeparator/corpo"]
+position = Vector2( 116, -42.6667 )
+scale = Vector2( 1.33333, 1.33333 )
+collision_layer = 8
+collision_mask = 8
+script = ExtResource( 12 )
+id = 4
+
+[node name="CollisionShape2D" type="CollisionShape2D" parent="PowerUpControl/Control2/VSeparator/corpo/Area2D12"]
+position = Vector2( 32, 32 )
+shape = SubResource( 11 )
+
+[node name="buttons" type="Node2D" parent="PowerUpControl/Control2/VSeparator"]
+position = Vector2( 24, 422 )
+script = ExtResource( 8 )
 
 [node name="CanvasLayer" type="CanvasLayer" parent="."]
 layer = -1
@@ -169,4 +340,4 @@ theme = SubResource( 9 )
 [connection signal="level_up" from="bacteria" to="PowerUpControl" method="_on_bacteria_level_up"]
 [connection signal="button_down" from="restarter/MarginContainer/VBoxContainer/Button" to="restarter" method="_on_Button_button_down"]
 [connection signal="item_activated" from="PowerUpControl/Control/VSeparator/ItemList" to="PowerUpControl" method="_on_ItemList_item_activated"]
-[connection signal="item_activated" from="PowerUpControl/Control/VSeparator2/ItemList2" to="PowerUpControl" method="_on_ItemList2_item_activated"]
+[connection signal="item_activated" from="PowerUpControl/Control2/VSeparator/ItemList" to="PowerUpControl" method="_on_ItemList_item_activated"]

ui/Area2D2.gd

@@ -0,0 +1,26 @@
+extends Area2D
+
+export var id = 0
+
+func _ready():
+	connect("area_entered",self, '_on_Area2D2_area_entered')
+	connect("area_exited",self, '_on_Area2D2_area_exited')
+	var sprite = Sprite.new()
+	sprite.texture = preload('res://ui/button.png')
+	sprite.position = Vector2(32,32)
+	add_child(sprite)
+
+func _on_Area2D2_area_entered(area):
+	print()
+	print(str(id) + ' ' + area.get_parent().name + ' ' + get_parent().name)
+	modulate = Color(0.5,0.5,0.5)
+	area.get_parent().posswitch = false
+	area.get_parent().initpos2 = global_position
+	pass # Replace with function body.
+
+
+func _on_Area2D2_area_exited(area):
+	modulate = Color(1.0,1.0,1.0)
+	area.get_parent().posswitch = true
+	area.get_parent().initpos2 = global_position
+	pass # Replace with function body.

ui/Button.tscn

@@ -0,0 +1,46 @@
+[gd_scene load_steps=6 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://Inseto2.png" type="Texture" id=3]
+[ext_resource path="res://newdynamicfont.tres" type="DynamicFont" id=4]
+
+[sub_resource type="RectangleShape2D" id=10]
+
+[node name="Button" type="TouchScreenButton"]
+normal = ExtResource( 2 )
+pressed = ExtResource( 3 )
+script = ExtResource( 1 )
+
+[node name="Button" type="Button" parent="."]
+margin_right = 63.0
+margin_bottom = 66.0
+flat = true
+
+[node name="Label" type="Label" parent="."]
+margin_left = -275.0
+margin_top = 1.0
+margin_right = -6.0
+margin_bottom = 61.0
+custom_fonts/font = ExtResource( 4 )
+text = "stuff"
+align = 1
+valign = 1
+
+[node name="ColorRect" type="ColorRect" parent="Label"]
+show_behind_parent = true
+anchor_right = 1.0
+anchor_bottom = 1.0
+margin_right = 1.0
+color = Color( 0, 0, 0, 0.321569 )
+
+[node name="col" type="Area2D" parent="."]
+collision_layer = 0
+collision_mask = 0
+
+[node name="CollisionShape2D" type="CollisionShape2D" parent="col"]
+position = Vector2( 32, 32 )
+shape = SubResource( 10 )
+
+[connection signal="mouse_entered" from="Button" to="." method="_on_Button_mouse_entered"]
+[connection signal="mouse_exited" from="Button" to="." method="_on_Button_mouse_exited"]

ui/InterfaceLevelUpNew.png.import

@@ -0,0 +1,35 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/InterfaceLevelUpNew.png-57c9b6c02883096f39456bab90990bd3.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://ui/InterfaceLevelUpNew.png"
+dest_files=[ "res://.import/InterfaceLevelUpNew.png-57c9b6c02883096f39456bab90990bd3.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/TouchScreenButton.gd

@@ -0,0 +1,29 @@
+extends TouchScreenButton
+
+onready var initpos = global_position
+onready var initpos2 = global_position
+var posswitch = true
+
+export var collayer = 4
+
+func _physics_process(delta):
+	$col.collision_layer = collayer
+	$col.collision_mask = collayer
+	$Label.show()
+	global_position = initpos if posswitch else initpos2
+	if not posswitch: $Label.hide()
+	if is_pressed(): 
+		$Label.hide()
+		global_position = get_global_mouse_position()
+
+
+func _on_Button_mouse_entered():
+	print('mouse in')
+#	$Label.show()
+	pass # Replace with function body.
+
+
+func _on_Button_mouse_exited():
+	print('mouse out')
+#	$Label.hide()
+	pass # Replace with function body.

ui/button.png.import

@@ -0,0 +1,35 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/button.png-8078cadb1f4a4a2b5da3ea9be6434a03.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://ui/button.png"
+dest_files=[ "res://.import/button.png-8078cadb1f4a4a2b5da3ea9be6434a03.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