diff --git a/engine.cfg b/engine.cfg index 4983b55..7f320b6 100644 --- a/engine.cfg +++ b/engine.cfg @@ -18,12 +18,12 @@ stretch_mode="2d" [input] +A=[jbutton(0, 9), key(Space)] slow_motion=[key(Return)] fire=[key(Space), mbutton(0, 1)] Start=[jbutton(0, 6)] B=[jbutton(0, 8)] Coin=[jbutton(0, 7)] -A=[jbutton(0, 9)] Coin2=[jbutton(0, 4)] Select=[jbutton(0, 5)] Y=[jbutton(0, 10)] diff --git a/scripts/base.gd b/scripts/base.gd index 6fd739e..db9383e 100644 --- a/scripts/base.gd +++ b/scripts/base.gd @@ -101,7 +101,7 @@ class StateAiming: cannon.set_rot(deg2rad(base.cannon_rotation)) func input(event): - if event.is_action_pressed("slow_motion"): + if event.is_action_pressed("slow_motion") or event.is_action_pressed("X"): OS.set_time_scale(0.15) if event.is_action_released("fire") or event.is_action_released("A") and reload_timer <= 0: print("We fire") diff --git a/stages/main_stage.tscn b/stages/main_stage.tscn index f59be07..3cf90cb 100644 --- a/stages/main_stage.tscn +++ b/stages/main_stage.tscn @@ -46,11 +46,18 @@ func update_value(val): [sub_resource type="GDScript" id=4] script/source = "extends TextureButton + func _ready(): - connect(\"button_down\", self, \"restart\") + set_process_input(true) + game_manager.update_ui() connect(\"visibility_changed\", self, \"on_visibility_changed\") +func _input(event): + if is_visible(): + if event.is_action_pressed(\"Coin\") or event.is_action_pressed(\"Coin2\"): + restart() + func on_visibility_changed(): randomize() print(\"WE ARE NOW VISIBLE? %s\" % is_visible())