Asset Cleanup

export_presets.cfg

@@ -70,7 +70,7 @@ progressive_web_app/enabled=true
 progressive_web_app/offline_page=""
 progressive_web_app/display=1
 progressive_web_app/orientation=1
-progressive_web_app/icon_144x144=""
-progressive_web_app/icon_180x180=""
-progressive_web_app/icon_512x512=""
+progressive_web_app/icon_144x144="res://icon.svg"
+progressive_web_app/icon_180x180="res://icon.svg"
+progressive_web_app/icon_512x512="res://icon.svg"
 progressive_web_app/background_color=Color( 0, 0, 0, 1 )

icon.svg.import

@@ -0,0 +1,35 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/icon.svg-218a8f2b3041327d8a5756f3a245f83b.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://icon.svg"
+dest_files=[ "res://.import/icon.svg-218a8f2b3041327d8a5756f3a245f83b.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=false
+svg/scale=1.0

sounds/theme/theme.ogg.import

@@ -0,0 +1,15 @@
+[remap]
+
+importer="ogg_vorbis"
+type="AudioStreamOGGVorbis"
+path="res://.import/theme.ogg-ab6e3051c1dc81721010f0cb9825cb4c.oggstr"
+
+[deps]
+
+source_file="res://sounds/theme/theme.ogg"
+dest_files=[ "res://.import/theme.ogg-ab6e3051c1dc81721010f0cb9825cb4c.oggstr" ]
+
+[params]
+
+loop=true
+loop_offset=0

src/Actors/Birb.tscn

@@ -12,7 +12,7 @@ extents = Vector2( 24, 26 )
 
 [sub_resource type="RectangleShape2D" id=13]
 resource_local_to_scene = true
-extents = Vector2( 30, 30 )
+extents = Vector2( 32, 32 )
 
 [sub_resource type="RectangleShape2D" id=6]
 extents = Vector2( 100, 64 )

src/Actors/Player.tscn

@@ -12,7 +12,7 @@
 [ext_resource path="res://sounds/action/shoot_no_ammo.wav" type="AudioStream" id=10]
 
 [sub_resource type="RectangleShape2D" id=1]
-extents = Vector2( 44, 26 )
+extents = Vector2( 44, 27 )
 
 [sub_resource type="Animation" id=2]
 length = 0.001

src/Actors/Rock.tscn

@@ -6,11 +6,11 @@
 
 [sub_resource type="RectangleShape2D" id=1]
 resource_local_to_scene = true
-extents = Vector2( 28, 26 )
+extents = Vector2( 26, 26 )
 
 [sub_resource type="RectangleShape2D" id=2]
 resource_local_to_scene = true
-extents = Vector2( 32, 30 )
+extents = Vector2( 32, 32 )
 
 [node name="Rock" instance=ExtResource( 1 )]
 script = ExtResource( 3 )
@@ -19,12 +19,8 @@ script = ExtResource( 3 )
 texture = ExtResource( 2 )
 
 [node name="FloorCollision" parent="." index="1"]
-position = Vector2( 0, 6 )
 shape = SubResource( 1 )
 
-[node name="VisibilityNotifier2D" parent="." index="2"]
-rect = Rect2( -32, -28, 64, 64 )
-
 [node name="CollisionShape2D" parent="ImpactCollision" index="0"]
-position = Vector2( 0, 4 )
+position = Vector2( 0, 0 )
 shape = SubResource( 2 )

src/GUI/AmmoGUI.tscn

@@ -11,65 +11,65 @@ __meta__ = {
 }
 
 [node name="PlaceHolderCenterContainer" type="CenterContainer" parent="."]
-margin_right = 40.0
-margin_bottom = 30.0
+margin_right = 25.0
+margin_bottom = 13.0
 __meta__ = {
 "_edit_use_anchors_": false
 }
 
 [node name="PlaceHolderTextureRect" type="TextureRect" parent="PlaceHolderCenterContainer"]
-margin_right = 40.0
-margin_bottom = 30.0
+margin_right = 25.0
+margin_bottom = 13.0
 texture = ExtResource( 1 )
 
 [node name="PlaceHolderCenterContainer5" type="CenterContainer" parent="."]
-margin_left = 44.0
-margin_right = 84.0
-margin_bottom = 30.0
+margin_left = 29.0
+margin_right = 54.0
+margin_bottom = 13.0
 __meta__ = {
 "_edit_use_anchors_": false
 }
 
 [node name="PlaceHolderTextureRect" type="TextureRect" parent="PlaceHolderCenterContainer5"]
-margin_right = 40.0
-margin_bottom = 30.0
+margin_right = 25.0
+margin_bottom = 13.0
 texture = ExtResource( 1 )
 
 [node name="PlaceHolderCenterContainer4" type="CenterContainer" parent="."]
-margin_left = 88.0
-margin_right = 128.0
-margin_bottom = 30.0
+margin_left = 58.0
+margin_right = 83.0
+margin_bottom = 13.0
 __meta__ = {
 "_edit_use_anchors_": false
 }
 
 [node name="PlaceHolderTextureRect" type="TextureRect" parent="PlaceHolderCenterContainer4"]
-margin_right = 40.0
-margin_bottom = 30.0
+margin_right = 25.0
+margin_bottom = 13.0
 texture = ExtResource( 1 )
 
 [node name="PlaceHolderCenterContainer3" type="CenterContainer" parent="."]
-margin_left = 132.0
-margin_right = 172.0
-margin_bottom = 30.0
+margin_left = 87.0
+margin_right = 112.0
+margin_bottom = 13.0
 __meta__ = {
 "_edit_use_anchors_": false
 }
 
 [node name="PlaceHolderTextureRect" type="TextureRect" parent="PlaceHolderCenterContainer3"]
-margin_right = 40.0
-margin_bottom = 30.0
+margin_right = 25.0
+margin_bottom = 13.0
 texture = ExtResource( 1 )
 
 [node name="PlaceHolderCenterContainer2" type="CenterContainer" parent="."]
-margin_left = 176.0
-margin_right = 216.0
-margin_bottom = 30.0
+margin_left = 116.0
+margin_right = 141.0
+margin_bottom = 13.0
 __meta__ = {
 "_edit_use_anchors_": false
 }
 
 [node name="PlaceHolderTextureRect" type="TextureRect" parent="PlaceHolderCenterContainer2"]
-margin_right = 40.0
-margin_bottom = 30.0
+margin_right = 25.0
+margin_bottom = 13.0
 texture = ExtResource( 1 )

src/GUI/ControllerButtons.gd

@@ -0,0 +1,38 @@
+tool
+extends Control
+
+enum buttons { X = 1, Y = 2, B = 4, A = 8 }
+export(int, FLAGS, "X", "Y", "B", "A") var selected_buttons
+
+onready var y_button: Button = $CenterContainer/Buttons/YButton
+onready var x_button: Button = $CenterContainer/Buttons/XButton
+onready var b_button: Button = $CenterContainer/Buttons/BButton
+onready var a_button: Button = $CenterContainer/Buttons/AButton
+
+
+func _ready() -> void:
+	set_button_colors()
+
+
+func _process(_delta) -> void:
+	if Engine.editor_hint:
+		set_button_colors()
+
+
+func set_button_colors() -> void:
+	if buttons.A & selected_buttons:
+		a_button.modulate = Color("#3cdb4e")
+	else:
+		a_button.modulate = Color(1, 1, 1)
+	if buttons.B & selected_buttons:
+		b_button.modulate = Color("#d04242")
+	else:
+		b_button.modulate = Color(1, 1, 1)
+	if buttons.X & selected_buttons:
+		x_button.modulate = Color("#40ccd0")
+	else:
+		x_button.modulate = Color(1, 1, 1)
+	if buttons.Y & selected_buttons:
+		y_button.modulate = Color("#ecdb33")
+	else:
+		y_button.modulate = Color(1, 1, 1)