diff --git a/Main Menu.gd b/Main Menu.gd deleted file mode 100644 index 92230d1..0000000 --- a/Main Menu.gd +++ /dev/null @@ -1,33 +0,0 @@ -extends Node - -signal complete(option) - - -func _on_new_game_button_pressed() -> void: - emit_signal('complete', 'new game') - return - - -func _on_quit_button_pressed() -> void: - emit_signal('complete', 'quit') - return - - -func _on_Quit_Button_mouse_entered() -> void: - get_node("Menu-Select").play(0.0) - return - - -func _on_Credits_Button_mouse_entered() -> void: - get_node("Menu-Select").play(0.0) - return - - -func _on_Settings_Button_mouse_entered() -> void: - get_node("Menu-Select").play(0.0) - return - - -func _on_New_Game_Button_mouse_entered() -> void: - get_node("Menu-Select").play(0.0) - return diff --git a/Main Menu.tscn b/Main Menu.tscn deleted file mode 100644 index 722b981..0000000 --- a/Main Menu.tscn +++ /dev/null @@ -1,140 +0,0 @@ -[gd_scene load_steps=18 format=2] - -[ext_resource path="res://Sprites/Settings_Button_Normal.png" type="Texture" id=1] -[ext_resource path="res://Sprites/Continue_Button_Hover.png" type="Texture" id=2] -[ext_resource path="res://Sprites/Credits_Button_Normal.png" type="Texture" id=3] -[ext_resource path="res://Sprites/Continue_Button_Normal.png" type="Texture" id=4] -[ext_resource path="res://Sprites/New_Game_Button_Normal.png" type="Texture" id=5] -[ext_resource path="res://Sprites/Continue_Button_Disabled.png" type="Texture" id=6] -[ext_resource path="res://Sprites/New_Game_Button_Hover.png" type="Texture" id=7] -[ext_resource path="res://Sprites/Quit_Button_Normal.png" type="Texture" id=8] -[ext_resource path="res://Sprites/Credits_Button_Hover.png" type="Texture" id=9] -[ext_resource path="res://Sprites/Settings_Button_Hover.png" type="Texture" id=10] -[ext_resource path="res://Sprites/Quit_Button_Hover.png" type="Texture" id=11] -[ext_resource path="res://Sprites/Main_Menu_Background.png" type="Texture" id=12] -[ext_resource path="res://Resources/Ash.tres" type="DynamicFontData" id=13] -[ext_resource path="res://Main Menu.gd" type="Script" id=14] -[ext_resource path="res://Music/main-menu.mp3" type="AudioStream" id=15] -[ext_resource path="res://Sounds/menu-select.wav" type="AudioStream" id=16] - -[sub_resource type="DynamicFont" id=1] -size = 20 -use_mipmaps = true -extra_spacing_bottom = 15 -font_data = ExtResource( 13 ) - -[node name="Main Menu" type="Node"] -script = ExtResource( 14 ) - -[node name="Background" type="Sprite" parent="."] -texture = ExtResource( 12 ) -centered = false - -[node name="Menu Items" type="MarginContainer" parent="."] -margin_left = 10.0 -margin_top = 10.0 -rect_min_size = Vector2( 300, 160 ) -__meta__ = { -"_edit_use_anchors_": false -} - -[node name="VBoxContainer" type="VBoxContainer" parent="Menu Items"] -margin_right = 300.0 -margin_bottom = 160.0 -alignment = 2 - -[node name="Title" type="Label" parent="Menu Items/VBoxContainer"] -margin_top = 23.0 -margin_right = 300.0 -margin_bottom = 62.0 -custom_fonts/font = SubResource( 1 ) -text = "Embodiment" -align = 1 -valign = 1 - -[node name="CenterContainer" type="CenterContainer" parent="Menu Items/VBoxContainer"] -margin_top = 66.0 -margin_right = 300.0 -margin_bottom = 160.0 - -[node name="Menu Options" type="VBoxContainer" parent="Menu Items/VBoxContainer/CenterContainer"] -margin_left = 108.0 -margin_right = 191.0 -margin_bottom = 94.0 - -[node name="CenterContainer" type="CenterContainer" parent="Menu Items/VBoxContainer/CenterContainer/Menu Options"] -margin_right = 83.0 -margin_bottom = 15.0 - -[node name="Continue Button" type="TextureButton" parent="Menu Items/VBoxContainer/CenterContainer/Menu Options/CenterContainer"] -margin_left = 7.0 -margin_right = 75.0 -margin_bottom = 15.0 -disabled = true -texture_normal = ExtResource( 4 ) -texture_hover = ExtResource( 2 ) -texture_disabled = ExtResource( 6 ) - -[node name="CenterContainer2" type="CenterContainer" parent="Menu Items/VBoxContainer/CenterContainer/Menu Options"] -margin_top = 19.0 -margin_right = 83.0 -margin_bottom = 33.0 - -[node name="New Game Button" type="TextureButton" parent="Menu Items/VBoxContainer/CenterContainer/Menu Options/CenterContainer2"] -margin_right = 83.0 -margin_bottom = 14.0 -texture_normal = ExtResource( 5 ) -texture_hover = ExtResource( 7 ) - -[node name="CenterContainer3" type="CenterContainer" parent="Menu Items/VBoxContainer/CenterContainer/Menu Options"] -margin_top = 37.0 -margin_right = 83.0 -margin_bottom = 56.0 - -[node name="Settings Button" type="TextureButton" parent="Menu Items/VBoxContainer/CenterContainer/Menu Options/CenterContainer3"] -margin_left = 11.0 -margin_right = 72.0 -margin_bottom = 19.0 -texture_normal = ExtResource( 1 ) -texture_hover = ExtResource( 10 ) - -[node name="CenterContainer4" type="CenterContainer" parent="Menu Items/VBoxContainer/CenterContainer/Menu Options"] -margin_top = 60.0 -margin_right = 83.0 -margin_bottom = 75.0 - -[node name="Credits Button" type="TextureButton" parent="Menu Items/VBoxContainer/CenterContainer/Menu Options/CenterContainer4"] -margin_left = 16.0 -margin_right = 67.0 -margin_bottom = 15.0 -texture_normal = ExtResource( 3 ) -texture_hover = ExtResource( 9 ) - -[node name="CenterContainer5" type="CenterContainer" parent="Menu Items/VBoxContainer/CenterContainer/Menu Options"] -margin_top = 79.0 -margin_right = 83.0 -margin_bottom = 94.0 - -[node name="Quit Button" type="TextureButton" parent="Menu Items/VBoxContainer/CenterContainer/Menu Options/CenterContainer5"] -margin_left = 24.0 -margin_right = 58.0 -margin_bottom = 15.0 -texture_normal = ExtResource( 8 ) -texture_hover = ExtResource( 11 ) - -[node name="BGM" type="AudioStreamPlayer" parent="."] -pause_mode = 2 -stream = ExtResource( 15 ) -volume_db = -14.136 -autoplay = true - -[node name="Menu-Select" type="AudioStreamPlayer" parent="."] -stream = ExtResource( 16 ) -volume_db = -15.146 - -[connection signal="mouse_entered" from="Menu Items/VBoxContainer/CenterContainer/Menu Options/CenterContainer2/New Game Button" to="." method="_on_New_Game_Button_mouse_entered"] -[connection signal="pressed" from="Menu Items/VBoxContainer/CenterContainer/Menu Options/CenterContainer2/New Game Button" to="." method="_on_new_game_button_pressed"] -[connection signal="mouse_entered" from="Menu Items/VBoxContainer/CenterContainer/Menu Options/CenterContainer3/Settings Button" to="." method="_on_Settings_Button_mouse_entered"] -[connection signal="mouse_entered" from="Menu Items/VBoxContainer/CenterContainer/Menu Options/CenterContainer4/Credits Button" to="." method="_on_Credits_Button_mouse_entered"] -[connection signal="mouse_entered" from="Menu Items/VBoxContainer/CenterContainer/Menu Options/CenterContainer5/Quit Button" to="." method="_on_Quit_Button_mouse_entered"] -[connection signal="pressed" from="Menu Items/VBoxContainer/CenterContainer/Menu Options/CenterContainer5/Quit Button" to="." method="_on_quit_button_pressed"] diff --git a/Music/main-menu.mp3 b/Music/Main_Menu.mp3 similarity index 100% rename from Music/main-menu.mp3 rename to Music/Main_Menu.mp3 diff --git a/Music/Main_Menu.mp3.import b/Music/Main_Menu.mp3.import new file mode 100644 index 0000000..034f42c --- /dev/null +++ b/Music/Main_Menu.mp3.import @@ -0,0 +1,15 @@ +[remap] + +importer="mp3" +type="AudioStreamMP3" +path="res://.import/Main_Menu.mp3-bcbeb06af5a268277e79865e6a90a5fe.mp3str" + +[deps] + +source_file="res://Music/Main_Menu.mp3" +dest_files=[ "res://.import/Main_Menu.mp3-bcbeb06af5a268277e79865e6a90a5fe.mp3str" ] + +[params] + +loop=true +loop_offset=0 diff --git a/Music/splash.wav b/Music/Splash_Screen.wav similarity index 100% rename from Music/splash.wav rename to Music/Splash_Screen.wav diff --git a/Sounds/menu-select.wav.import b/Music/Splash_Screen.wav.import similarity index 50% rename from Sounds/menu-select.wav.import rename to Music/Splash_Screen.wav.import index 3357828..ee626b9 100644 --- a/Sounds/menu-select.wav.import +++ b/Music/Splash_Screen.wav.import @@ -2,12 +2,12 @@ importer="wav" type="AudioStreamSample" -path="res://.import/menu-select.wav-f320a45aae63f3fbba09e0159e1d4a65.sample" +path="res://.import/Splash_Screen.wav-f452f261479ac5a6b452ea599a9625cd.sample" [deps] -source_file="res://Sounds/menu-select.wav" -dest_files=[ "res://.import/menu-select.wav-f320a45aae63f3fbba09e0159e1d4a65.sample" ] +source_file="res://Music/Splash_Screen.wav" +dest_files=[ "res://.import/Splash_Screen.wav-f452f261479ac5a6b452ea599a9625cd.sample" ] [params] diff --git a/Music/main-menu.mp3.import b/Music/main-menu.mp3.import deleted file mode 100644 index db07b08..0000000 --- a/Music/main-menu.mp3.import +++ /dev/null @@ -1,15 +0,0 @@ -[remap] - -importer="mp3" -type="AudioStreamMP3" -path="res://.import/main-menu.mp3-a3110e522aa326e0a7ec073589f38f44.mp3str" - -[deps] - -source_file="res://Music/main-menu.mp3" -dest_files=[ "res://.import/main-menu.mp3-a3110e522aa326e0a7ec073589f38f44.mp3str" ] - -[params] - -loop=true -loop_offset=0 diff --git a/Music/splash.wav.import b/Music/splash.wav.import deleted file mode 100644 index 7614d69..0000000 --- a/Music/splash.wav.import +++ /dev/null @@ -1,21 +0,0 @@ -[remap] - -importer="wav" -type="AudioStreamSample" -path="res://.import/splash.wav-91b3de33ef16f1599e1c97be0c07ebd5.sample" - -[deps] - -source_file="res://Music/splash.wav" -dest_files=[ "res://.import/splash.wav-91b3de33ef16f1599e1c97be0c07ebd5.sample" ] - -[params] - -force/8_bit=false -force/mono=false -force/max_rate=false -force/max_rate_hz=44100 -edit/trim=false -edit/normalize=false -edit/loop=false -compress/mode=0 diff --git a/Player.gd b/Player.gd deleted file mode 100644 index 563a193..0000000 --- a/Player.gd +++ /dev/null @@ -1,41 +0,0 @@ -extends KinematicBody2D - -const ACCELERATION = 1000 -const MAX_SPEED = 120 -const FRICTION = 1000 - -var velocity: Vector2 = Vector2.ZERO -var isDash = false -var counter = 0 - - -func _physics_process(delta) -> void: - var input_vector: Vector2 = Vector2.ZERO - - input_vector.x = Input.get_action_strength('player_right') - Input.get_action_strength('player_left') - input_vector.y = Input.get_action_strength('player_down') - Input.get_action_strength('player_up') - input_vector = input_vector.normalized() - - if input_vector != Vector2.ZERO: - $AnimationTree.set('parameters/Idle/blend_position', input_vector) - velocity = velocity.move_toward(input_vector * MAX_SPEED, ACCELERATION * delta) - else: - velocity = velocity.move_toward(Vector2.ZERO, FRICTION * delta) - - # if dashing, increase velocity by 4 for one frame - if Input.is_action_just_pressed("player_dash") and input_vector != Vector2.ZERO and isDash == false: - velocity = velocity * 4 - isDash = true - - # If the dash was previously pressed, start a counter - if isDash: - counter += 1 - - # wait time before you can dash again - if counter > 60: - counter = 0 - isDash = false - - - velocity = move_and_slide(velocity) - return diff --git a/Player.tscn b/Player.tscn deleted file mode 100644 index e621a9d..0000000 --- a/Player.tscn +++ /dev/null @@ -1,212 +0,0 @@ -[gd_scene load_steps=19 format=2] - -[ext_resource path="res://Player.gd" type="Script" id=1] -[ext_resource path="res://Sprites/Player.png" type="Texture" id=2] -[ext_resource path="res://Sprites/Player_Down.png" type="Texture" id=3] -[ext_resource path="res://Sprites/Player_Up.png" type="Texture" id=4] - -[sub_resource type="SpriteFrames" id=1] -animations = [ { -"frames": [ ExtResource( 4 ) ], -"loop": false, -"name": "look_up", -"speed": 5.0 -}, { -"frames": [ ExtResource( 2 ) ], -"loop": false, -"name": "look_right", -"speed": 5.0 -}, { -"frames": [ ExtResource( 2 ) ], -"loop": false, -"name": "look_left", -"speed": 5.0 -}, { -"frames": [ ExtResource( 3 ) ], -"loop": false, -"name": "look_down", -"speed": 5.0 -} ] - -[sub_resource type="CapsuleShape2D" id=2] -radius = 3.0 -height = 5.0 - -[sub_resource type="CapsuleShape2D" id=3] -radius = 5.5 -height = 3.75 - -[sub_resource type="Animation" id=4] -resource_name = "Look Down" -length = 0.001 -tracks/0/type = "value" -tracks/0/path = NodePath("Sprite:animation") -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": 1, -"values": [ "look_down" ] -} -tracks/1/type = "value" -tracks/1/path = NodePath("Sprite:flip_h") -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": 1, -"values": [ false ] -} - -[sub_resource type="Animation" id=5] -length = 0.001 -tracks/0/type = "value" -tracks/0/path = NodePath("Sprite:animation") -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": 1, -"values": [ "look_right" ] -} -tracks/1/type = "value" -tracks/1/path = NodePath("Sprite:flip_h") -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": 1, -"values": [ true ] -} - -[sub_resource type="Animation" id=6] -length = 0.001 -tracks/0/type = "value" -tracks/0/path = NodePath("Sprite:animation") -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": 1, -"values": [ "look_right" ] -} -tracks/1/type = "value" -tracks/1/path = NodePath("Sprite:flip_h") -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": 1, -"values": [ false ] -} - -[sub_resource type="Animation" id=7] -resource_name = "Look Up" -length = 0.001 -tracks/0/type = "value" -tracks/0/path = NodePath("Sprite:animation") -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": 1, -"values": [ "look_up" ] -} -tracks/1/type = "value" -tracks/1/path = NodePath("Sprite:flip_h") -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": 1, -"values": [ false ] -} - -[sub_resource type="AnimationNodeAnimation" id=8] -animation = "Look Left" - -[sub_resource type="AnimationNodeAnimation" id=9] -animation = "Look Down" - -[sub_resource type="AnimationNodeAnimation" id=10] -animation = "Look Right" - -[sub_resource type="AnimationNodeAnimation" id=11] -animation = "Look Up" - -[sub_resource type="AnimationNodeBlendSpace2D" id=12] -blend_point_0/node = SubResource( 8 ) -blend_point_0/pos = Vector2( -1.01, 0 ) -blend_point_1/node = SubResource( 9 ) -blend_point_1/pos = Vector2( 0, 1.1 ) -blend_point_2/node = SubResource( 10 ) -blend_point_2/pos = Vector2( 1, 0 ) -blend_point_3/node = SubResource( 11 ) -blend_point_3/pos = Vector2( 0, -1.1 ) -min_space = Vector2( -1.01, -1.1 ) -max_space = Vector2( 1, 1.1 ) -blend_mode = 1 - -[sub_resource type="AnimationNodeStateMachine" id=13] -states/Idle/node = SubResource( 12 ) -states/Idle/position = Vector2( -2901.63, -177 ) -start_node = "Idle" -graph_offset = Vector2( -3591.37, -302.6 ) - -[sub_resource type="AnimationNodeStateMachinePlayback" id=14] - -[node name="Player" type="KinematicBody2D"] -script = ExtResource( 1 ) - -[node name="Sprite" type="AnimatedSprite" parent="."] -position = Vector2( 0, -5 ) -frames = SubResource( 1 ) -animation = "look_right" - -[node name="Collision" type="CollisionShape2D" parent="."] -visible = false -rotation = 1.5708 -shape = SubResource( 2 ) - -[node name="Hitbox" type="CollisionShape2D" parent="."] -visible = false -position = Vector2( 0, -5 ) -shape = SubResource( 3 ) - -[node name="AnimationPlayer" type="AnimationPlayer" parent="."] -autoplay = "Look Right" -"anims/Look Down" = SubResource( 4 ) -"anims/Look Left" = SubResource( 5 ) -"anims/Look Right" = SubResource( 6 ) -"anims/Look Up" = SubResource( 7 ) - -[node name="AnimationTree" type="AnimationTree" parent="."] -tree_root = SubResource( 13 ) -anim_player = NodePath("../AnimationPlayer") -active = true -parameters/playback = SubResource( 14 ) -parameters/Idle/blend_position = Vector2( 0.993787, 0.0189655 ) diff --git a/Player/Player.gd b/Player/Player.gd index 563a193..174273f 100644 --- a/Player/Player.gd +++ b/Player/Player.gd @@ -1,41 +1,76 @@ extends KinematicBody2D -const ACCELERATION = 1000 -const MAX_SPEED = 120 -const FRICTION = 1000 +export var ACCELERATION: int = 1000 +export var MAX_SPEED: int = 120 +export var FRICTION: int = 1000 +const HEALTH_SLICES: Array = [0, 18, 35, 50, 65, 82, 100] +var health_index: int = 6 + +var hud: CanvasLayer = null var velocity: Vector2 = Vector2.ZERO -var isDash = false -var counter = 0 -func _physics_process(delta) -> void: - var input_vector: Vector2 = Vector2.ZERO +func _physics_process(delta: float) -> void: + var input_vector: Vector2 = Vector2.ZERO - input_vector.x = Input.get_action_strength('player_right') - Input.get_action_strength('player_left') - input_vector.y = Input.get_action_strength('player_down') - Input.get_action_strength('player_up') - input_vector = input_vector.normalized() + input_vector.x = Input.get_action_strength('player_right') \ + - Input.get_action_strength('player_left') + input_vector.y = Input.get_action_strength('player_down') \ + - Input.get_action_strength('player_up') + input_vector = input_vector.normalized() - if input_vector != Vector2.ZERO: - $AnimationTree.set('parameters/Idle/blend_position', input_vector) - velocity = velocity.move_toward(input_vector * MAX_SPEED, ACCELERATION * delta) - else: - velocity = velocity.move_toward(Vector2.ZERO, FRICTION * delta) - - # if dashing, increase velocity by 4 for one frame - if Input.is_action_just_pressed("player_dash") and input_vector != Vector2.ZERO and isDash == false: - velocity = velocity * 4 - isDash = true - - # If the dash was previously pressed, start a counter - if isDash: - counter += 1 - - # wait time before you can dash again - if counter > 60: - counter = 0 - isDash = false - + if input_vector != Vector2.ZERO: + $AnimationTree.set('parameters/Idle/blend_position', input_vector) + velocity = velocity.move_toward(input_vector * MAX_SPEED, ACCELERATION * delta) + else: + velocity = velocity.move_toward(Vector2.ZERO, FRICTION * delta) - velocity = move_and_slide(velocity) - return + velocity = move_and_slide(velocity) + return + + +func load_hud(node: CanvasLayer) -> void: + hud = node + if hud.connect('add_currency', self, 'add_currency') != OK: + print('ERROR: HUD "add_currency" signal already connected.') + + hud.update_health(HEALTH_SLICES[health_index]) + hud.update_currency($Inventory.get_currency()) + return + + +func add_currency(amount: int) -> void: + $Inventory.add_currency(amount) + return + + +func _on_Inventory_update_currency(amount: int) -> void: + hud.update_currency(amount) + return + + +func _on_Hitbox_body_entered(body: Node) -> void: + if not 'enemies' in body.get_groups(): + return + + if health_index != 0: + health_index -= 1 + hud.update_health(HEALTH_SLICES[health_index]) + return + + +func _input(event: InputEvent) -> void: + if event.is_action_pressed('screenshot'): + var img: Image = get_viewport().get_texture().get_data() + yield(get_tree(), "idle_frame") + yield(get_tree(), "idle_frame") + + img.flip_y() + + var time: Dictionary = OS.get_datetime_from_unix_time(OS.get_unix_time()) + var time_msecs: int = OS.get_system_time_msecs() + + if img.save_png('user://Screenshot_%d%d%d_%d.png' % [time.year, time.month, time.day, time_msecs]) != OK: + print('ERROR: Failed saving screenshot.') + return diff --git a/Player/Player.tscn b/Player/Player.tscn index fe90b29..4988cd5 100644 --- a/Player/Player.tscn +++ b/Player/Player.tscn @@ -1,22 +1,23 @@ -[gd_scene load_steps=19 format=2] +[gd_scene load_steps=20 format=2] [ext_resource path="res://Player/Player.gd" type="Script" id=1] -[ext_resource path="res://Sprites/Player.png" type="Texture" id=2] -[ext_resource path="res://Sprites/Player_Down.png" type="Texture" id=3] -[ext_resource path="res://Sprites/Player_Up.png" type="Texture" id=4] +[ext_resource path="res://Sprites/Player/Player.png" type="Texture" id=2] +[ext_resource path="res://Sprites/Player/Player_Down.png" type="Texture" id=3] +[ext_resource path="res://Sprites/Player/Player_Up.png" type="Texture" id=4] +[ext_resource path="res://Player/Inventory.tscn" type="PackedScene" id=5] [sub_resource type="SpriteFrames" id=1] animations = [ { -"frames": [ ExtResource( 4 ) ], -"loop": false, -"name": "look_up", -"speed": 5.0 -}, { "frames": [ ExtResource( 2 ) ], "loop": false, "name": "look_right", "speed": 5.0 }, { +"frames": [ ExtResource( 4 ) ], +"loop": false, +"name": "look_up", +"speed": 5.0 +}, { "frames": [ ExtResource( 2 ) ], "loop": false, "name": "look_left", @@ -160,14 +161,14 @@ animation = "Look Up" [sub_resource type="AnimationNodeBlendSpace2D" id=12] blend_point_0/node = SubResource( 8 ) -blend_point_0/pos = Vector2( -1.01, 0 ) +blend_point_0/pos = Vector2( -1, 0 ) blend_point_1/node = SubResource( 9 ) blend_point_1/pos = Vector2( 0, 1.1 ) blend_point_2/node = SubResource( 10 ) blend_point_2/pos = Vector2( 1, 0 ) blend_point_3/node = SubResource( 11 ) blend_point_3/pos = Vector2( 0, -1.1 ) -min_space = Vector2( -1.01, -1.1 ) +min_space = Vector2( -1, -1.1 ) max_space = Vector2( 1, 1.1 ) blend_mode = 1 @@ -180,19 +181,25 @@ graph_offset = Vector2( -3591.37, -302.6 ) [sub_resource type="AnimationNodeStateMachinePlayback" id=14] [node name="Player" type="KinematicBody2D"] +collision_layer = 2 script = ExtResource( 1 ) [node name="Sprite" type="AnimatedSprite" parent="."] -position = Vector2( 0, -5 ) +light_mask = 2 frames = SubResource( 1 ) animation = "look_right" +offset = Vector2( 0, -5 ) [node name="Collision" type="CollisionShape2D" parent="."] visible = false rotation = 1.5708 shape = SubResource( 2 ) -[node name="Hitbox" type="CollisionShape2D" parent="."] +[node name="Hitbox" type="Area2D" parent="."] +collision_layer = 2 +collision_mask = 2 + +[node name="CollisionShape2D" type="CollisionShape2D" parent="Hitbox"] visible = false position = Vector2( 0, -5 ) shape = SubResource( 3 ) @@ -209,4 +216,9 @@ tree_root = SubResource( 13 ) anim_player = NodePath("../AnimationPlayer") active = true parameters/playback = SubResource( 14 ) -parameters/Idle/blend_position = Vector2( 0.993787, 0.0189655 ) +parameters/Idle/blend_position = Vector2( 0.0760697, 0 ) + +[node name="Inventory" parent="." instance=ExtResource( 5 )] + +[connection signal="body_entered" from="Hitbox" to="." method="_on_Hitbox_body_entered"] +[connection signal="update_currency" from="Inventory" to="." method="_on_Inventory_update_currency"] diff --git a/Sounds/menu-select.wav b/Sounds/Menu_Button_Hover.wav similarity index 100% rename from Sounds/menu-select.wav rename to Sounds/Menu_Button_Hover.wav diff --git a/Sounds/Menu_Button_Hover.wav.import b/Sounds/Menu_Button_Hover.wav.import new file mode 100644 index 0000000..f0d4ed8 --- /dev/null +++ b/Sounds/Menu_Button_Hover.wav.import @@ -0,0 +1,21 @@ +[remap] + +importer="wav" +type="AudioStreamSample" +path="res://.import/Menu_Button_Hover.wav-75f89d7289199347d0f0fb7d0f2abd1b.sample" + +[deps] + +source_file="res://Sounds/Menu_Button_Hover.wav" +dest_files=[ "res://.import/Menu_Button_Hover.wav-75f89d7289199347d0f0fb7d0f2abd1b.sample" ] + +[params] + +force/8_bit=false +force/mono=false +force/max_rate=false +force/max_rate_hz=44100 +edit/trim=false +edit/normalize=false +edit/loop=false +compress/mode=0 diff --git a/Splash Screen.gd b/Splash Screen.gd deleted file mode 100644 index af414e3..0000000 --- a/Splash Screen.gd +++ /dev/null @@ -1,29 +0,0 @@ -extends Sprite - -signal complete - - -func _ready() -> void: - # Fade in - if not $Tween.interpolate_property(self, 'self_modulate:a', 0, 1, 3, Tween.TRANS_LINEAR, Tween.EASE_IN): - print('ERROR: Splash Screen fade in animation has errors.') - if not $Tween.start(): - print('ERROR: Splash Screen fade in animation failed to start.') - - yield($Tween, 'tween_completed') # Wait for fade in to complete - - # Fade out - if not $Tween.interpolate_property(self, 'self_modulate:a', 1, 0, 3, Tween.TRANS_LINEAR, Tween.EASE_OUT, 2): - print('ERROR: Splash Screen fade out animation has errors.') - if not $Tween.start(): - print('ERROR: Splash Screen fade out animation failed to start.') - - yield($Tween, 'tween_completed') # Wait for fade out to complete - emit_signal('complete') - return - - -func _input(event: InputEvent) -> void: - if event.is_action_pressed('ui_accept'): - emit_signal('complete') - return diff --git a/Splash Screen.tscn b/Splash Screen.tscn deleted file mode 100644 index 42fc567..0000000 --- a/Splash Screen.tscn +++ /dev/null @@ -1,18 +0,0 @@ -[gd_scene load_steps=4 format=2] - -[ext_resource path="res://Sprites/Splash_Screen.png" type="Texture" id=1] -[ext_resource path="res://Splash Screen.gd" type="Script" id=2] -[ext_resource path="res://Music/splash.wav" type="AudioStream" id=3] - -[node name="Splash Screen" type="Sprite"] -self_modulate = Color( 1, 1, 1, 0 ) -texture = ExtResource( 1 ) -centered = false -script = ExtResource( 2 ) - -[node name="Tween" type="Tween" parent="."] - -[node name="BGM" type="AudioStreamPlayer" parent="."] -stream = ExtResource( 3 ) -volume_db = -15.146 -autoplay = true diff --git a/Sprites/Black_Background.png.import b/Sprites/Black_Background.png.import index 5cf4be8..d4f90cf 100644 --- a/Sprites/Black_Background.png.import +++ b/Sprites/Black_Background.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=false 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 diff --git a/Sprites/Continue_Button_Disabled.png.import b/Sprites/Continue_Button_Disabled.png.import index ff05a65..99da44f 100644 --- a/Sprites/Continue_Button_Disabled.png.import +++ b/Sprites/Continue_Button_Disabled.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=false 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 diff --git a/Sprites/Continue_Button_Hover.png.import b/Sprites/Continue_Button_Hover.png.import index 354df37..17d5b7a 100644 --- a/Sprites/Continue_Button_Hover.png.import +++ b/Sprites/Continue_Button_Hover.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=false 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 diff --git a/Sprites/Continue_Button_Normal.png.import b/Sprites/Continue_Button_Normal.png.import index 46fd155..ad75dd1 100644 --- a/Sprites/Continue_Button_Normal.png.import +++ b/Sprites/Continue_Button_Normal.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=false 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 diff --git a/Sprites/Credits_Button_Hover.png.import b/Sprites/Credits_Button_Hover.png.import index c58efe1..287554e 100644 --- a/Sprites/Credits_Button_Hover.png.import +++ b/Sprites/Credits_Button_Hover.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=false 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 diff --git a/Sprites/Credits_Button_Normal.png.import b/Sprites/Credits_Button_Normal.png.import index 82dcfde..c250c1b 100644 --- a/Sprites/Credits_Button_Normal.png.import +++ b/Sprites/Credits_Button_Normal.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=false 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 diff --git a/Sprites/Main_Menu_Background.png.import b/Sprites/Main_Menu_Background.png.import index 4612f91..d1233bd 100644 --- a/Sprites/Main_Menu_Background.png.import +++ b/Sprites/Main_Menu_Background.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=false 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 diff --git a/Sprites/New_Game_Button_Hover.png.import b/Sprites/New_Game_Button_Hover.png.import index 213728e..5cfbc0e 100644 --- a/Sprites/New_Game_Button_Hover.png.import +++ b/Sprites/New_Game_Button_Hover.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=false 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 diff --git a/Sprites/New_Game_Button_Normal.png.import b/Sprites/New_Game_Button_Normal.png.import index b19d0bf..4aaf5c4 100644 --- a/Sprites/New_Game_Button_Normal.png.import +++ b/Sprites/New_Game_Button_Normal.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=false 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 diff --git a/Sprites/Player.png.import b/Sprites/Player.png.import index d60fbdc..e9e6a19 100644 --- a/Sprites/Player.png.import +++ b/Sprites/Player.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=false 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 diff --git a/Sprites/Player_Down.png.import b/Sprites/Player_Down.png.import index 06a7b1f..05da358 100644 --- a/Sprites/Player_Down.png.import +++ b/Sprites/Player_Down.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=false 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 diff --git a/Sprites/Player_Up.png.import b/Sprites/Player_Up.png.import index 3e59f41..f61ec20 100644 --- a/Sprites/Player_Up.png.import +++ b/Sprites/Player_Up.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=false 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 diff --git a/Sprites/Quit_Button_Hover.png.import b/Sprites/Quit_Button_Hover.png.import index 0943088..dad3c7e 100644 --- a/Sprites/Quit_Button_Hover.png.import +++ b/Sprites/Quit_Button_Hover.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=false 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 diff --git a/Sprites/Quit_Button_Normal.png.import b/Sprites/Quit_Button_Normal.png.import index 796c4b9..90c53a9 100644 --- a/Sprites/Quit_Button_Normal.png.import +++ b/Sprites/Quit_Button_Normal.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=false 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 diff --git a/Sprites/Settings_Button_Hover.png.import b/Sprites/Settings_Button_Hover.png.import index 6d96bc2..e5dc4e9 100644 --- a/Sprites/Settings_Button_Hover.png.import +++ b/Sprites/Settings_Button_Hover.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=false 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 diff --git a/Sprites/Settings_Button_Normal.png.import b/Sprites/Settings_Button_Normal.png.import index 6549c94..feb835c 100644 --- a/Sprites/Settings_Button_Normal.png.import +++ b/Sprites/Settings_Button_Normal.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=false 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 diff --git a/Sprites/Splash_Screen.png.import b/Sprites/Splash_Screen.png.import index a4063df..cd8f183 100644 --- a/Sprites/Splash_Screen.png.import +++ b/Sprites/Splash_Screen.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=false 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 diff --git a/icon.png b/icon.png deleted file mode 100644 index c98fbb6..0000000 Binary files a/icon.png and /dev/null differ diff --git a/icon.png.import b/icon.png.import deleted file mode 100644 index 96cbf46..0000000 --- a/icon.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="StreamTexture" -path="res://.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://icon.png" -dest_files=[ "res://.import/icon.png-487276ed1e3a0c39cad0279d744ee560.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=true -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 -stream=false -size_limit=0 -detect_3d=true -svg/scale=1.0 diff --git a/project.godot b/project.godot index 3637c40..3f96c72 100644 --- a/project.godot +++ b/project.godot @@ -12,10 +12,11 @@ config_version=4 config/name="Embodiment" run/main_scene="res://Main.tscn" -boot_splash/image="res://Sprites/Black_Background.png" +run/delta_sync_after_draw=true +boot_splash/image="res://Sprites/Assets/Black_Background.png" boot_splash/use_filter=false boot_splash/bg_color=Color( 0, 0, 0, 1 ) -config/icon="res://icon.png" +config/icon="res://Sprites/Assets/icon.png" [display] @@ -48,9 +49,9 @@ player_down={ "events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":83,"physical_scancode":0,"unicode":0,"echo":false,"script":null) ] } -player_dash={ +screenshot={ "deadzone": 0.5, -"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":0,"physical_scancode":16777237,"unicode":0,"echo":false,"script":null) +"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777245,"physical_scancode":0,"unicode":0,"echo":false,"script":null) ] }