From 9ee778bd5db38b3dcc887e2e9d0e4b27b254f413 Mon Sep 17 00:00:00 2001 From: Nathan Lovato Date: Tue, 11 Feb 2020 17:21:15 -0600 Subject: [PATCH] Address requested changes in the review Remove unused spawn input action Add support for the gamepad's left stick for movement Use the project settings to store the gravity value project-wide Remove type hints --- 2d/platformer/project.godot | 9 +++------ 2d/platformer/src/Actors/Actor.gd | 2 +- 2d/platformer/src/Actors/Enemy.gd | 5 ++++- 2d/platformer/src/Main/Game.gd | 2 +- 2d/platformer/src/UserInterface/PauseMenu.gd | 4 ++-- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/2d/platformer/project.godot b/2d/platformer/project.godot index 9350ec7a..e5646e07 100644 --- a/2d/platformer/project.godot +++ b/2d/platformer/project.godot @@ -97,6 +97,7 @@ move_left={ "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":16777231,"unicode":0,"echo":false,"script":null) , Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":14,"pressure":0.0,"pressed":false,"script":null) , Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":65,"unicode":0,"echo":false,"script":null) +, Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":0,"axis":0,"axis_value":-1.0,"script":null) ] } move_right={ @@ -104,6 +105,7 @@ move_right={ "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":16777233,"unicode":0,"echo":false,"script":null) , Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":15,"pressure":0.0,"pressed":false,"script":null) , Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":68,"unicode":0,"echo":false,"script":null) +, Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":0,"axis":0,"axis_value":1.0,"script":null) ] } shoot={ @@ -114,12 +116,6 @@ shoot={ , Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"button_mask":0,"position":Vector2( 0, 0 ),"global_position":Vector2( 0, 0 ),"factor":1.0,"button_index":1,"pressed":false,"doubleclick":false,"script":null) ] } -spawn={ -"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":16777244,"unicode":0,"echo":false,"script":null) -, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":11,"pressure":0.0,"pressed":false,"script":null) - ] -} toggle_fullscreen={ "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":16777254,"unicode":0,"echo":false,"script":null) @@ -143,6 +139,7 @@ toggle_pause={ [physics] 2d/default_gravity=700 +2d/gravity_default=1800.0 [rasterizer] diff --git a/2d/platformer/src/Actors/Actor.gd b/2d/platformer/src/Actors/Actor.gd index 980768f4..288e9e1c 100644 --- a/2d/platformer/src/Actors/Actor.gd +++ b/2d/platformer/src/Actors/Actor.gd @@ -6,7 +6,7 @@ class_name Actor export var speed = Vector2(400.0, 500.0) -export var gravity = 3500.0 +export(float) var gravity = ProjectSettings.get("physics/2d/gravity_default") const FLOOR_NORMAL = Vector2.UP diff --git a/2d/platformer/src/Actors/Enemy.gd b/2d/platformer/src/Actors/Enemy.gd index 6db70ac0..21490309 100644 --- a/2d/platformer/src/Actors/Enemy.gd +++ b/2d/platformer/src/Actors/Enemy.gd @@ -8,7 +8,10 @@ onready var floor_detector_right = $FloorDetectorRight onready var sprite = $Sprite onready var animation_player = $AnimationPlayer -enum State {WALKING, DEAD} +enum State { + WALKING, + DEAD +} var _state = State.WALKING diff --git a/2d/platformer/src/Main/Game.gd b/2d/platformer/src/Main/Game.gd index d1f301a0..4e469abb 100644 --- a/2d/platformer/src/Main/Game.gd +++ b/2d/platformer/src/Main/Game.gd @@ -8,7 +8,7 @@ extends Node onready var _pause_menu = $InterfaceLayer/PauseMenu -func _input(event: InputEvent) -> void: +func _input(event): if event.is_action_pressed("toggle_fullscreen"): OS.window_fullscreen = not OS.window_fullscreen get_tree().set_input_as_handled() diff --git a/2d/platformer/src/UserInterface/PauseMenu.gd b/2d/platformer/src/UserInterface/PauseMenu.gd index 95e869d6..b94a13bf 100644 --- a/2d/platformer/src/UserInterface/PauseMenu.gd +++ b/2d/platformer/src/UserInterface/PauseMenu.gd @@ -17,10 +17,10 @@ func close(): visible = false -func _on_ResumeButton_pressed() -> void: +func _on_ResumeButton_pressed(): get_tree().paused = false visible = false -func _on_QuitButton_pressed() -> void: +func _on_QuitButton_pressed(): get_tree().quit()