From 911db44bc2c424823f901126fb457b7278e14994 Mon Sep 17 00:00:00 2001 From: Dustin Date: Fri, 11 Apr 2025 21:56:03 -0700 Subject: [PATCH] Second player --- Main.tscn | 4 ++++ project.godot | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/Main.tscn b/Main.tscn index cc48cc4..c510508 100644 --- a/Main.tscn +++ b/Main.tscn @@ -52,6 +52,10 @@ __meta__ = { [node name="PlayerE" parent="ViewportContainer/Viewport" instance=ExtResource( 1 )] position = Vector2( 112, 56 ) +[node name="PlayerE2" parent="ViewportContainer/Viewport" instance=ExtResource( 1 )] +position = Vector2( 112, 56 ) +player_number = 2 + [node name="UI_Layer" parent="ViewportContainer/Viewport" instance=ExtResource( 3 )] [node name="CameraGuide" type="KinematicBody2D" parent="ViewportContainer/Viewport"] diff --git a/project.godot b/project.godot index 082d5ef..c718d34 100644 --- a/project.godot +++ b/project.godot @@ -330,18 +330,20 @@ crouch_2={ } jump_2={ "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":74,"physical_scancode":0,"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":70,"physical_scancode":0,"unicode":0,"echo":false,"script":null) , Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":1,"button_index":0,"pressure":0.0,"pressed":false,"script":null) ] } attack_2={ "deadzone": 0.5, "events": [ Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":1,"button_index":2,"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":82,"physical_scancode":0,"unicode":0,"echo":false,"script":null) ] } attack_secondary_2={ "deadzone": 0.5, "events": [ Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":1,"button_index":3,"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":84,"physical_scancode":0,"unicode":0,"echo":false,"script":null) ] } switch_primary_item_1={ @@ -359,11 +361,13 @@ switch_secondary_item_1={ switch_primary_item_2={ "deadzone": 0.5, "events": [ Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":1,"button_index":4,"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":86,"physical_scancode":0,"unicode":0,"echo":false,"script":null) ] } switch_secondary_item_2={ "deadzone": 0.5, "events": [ Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":1,"button_index":5,"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":66,"physical_scancode":0,"unicode":0,"echo":false,"script":null) ] }