diff --git a/assets/characters/coco/coco.tscn b/assets/characters/coco/coco.tscn index 1961239..69e8b3a 100644 --- a/assets/characters/coco/coco.tscn +++ b/assets/characters/coco/coco.tscn @@ -6,7 +6,7 @@ [ext_resource type="SpineSkeletonFileResource" uid="uid://drnpfi1niq3od" path="res://assets/characters/coco/spine.skel" id="5_enjjr"] [ext_resource type="Script" path="res://src/spine_sprite.gd" id="5_migwh"] -[sub_resource type="ViewportTexture" id="ViewportTexture_lrt2l"] +[sub_resource type="ViewportTexture" id="ViewportTexture_xyxp2"] viewport_path = NodePath("MeshInstance3D/SubViewport") [sub_resource type="ShaderMaterial" id="ShaderMaterial_5xxpu"] @@ -17,7 +17,7 @@ transparency = 1 shading_mode = 0 diffuse_mode = 3 specular_mode = 1 -albedo_texture = SubResource("ViewportTexture_lrt2l") +albedo_texture = SubResource("ViewportTexture_xyxp2") billboard_mode = 1 [sub_resource type="QuadMesh" id="QuadMesh_iwcmf"] diff --git a/assets/characters/coco/npc_coco.tscn b/assets/characters/coco/npc_coco.tscn index 5bc2897..c378797 100644 --- a/assets/characters/coco/npc_coco.tscn +++ b/assets/characters/coco/npc_coco.tscn @@ -4,7 +4,7 @@ [ext_resource type="SpineSkeletonDataResource" uid="uid://dn5wtcrr40ahd" path="res://assets/characters/coco/coco.tres" id="2_8ur8k"] [ext_resource type="Script" path="res://src/spine_sprite.gd" id="3_m02kv"] -[sub_resource type="ViewportTexture" id="ViewportTexture_5o5t4"] +[sub_resource type="ViewportTexture" id="ViewportTexture_xy31o"] viewport_path = NodePath("MeshInstance3D/SubViewport") [sub_resource type="ShaderMaterial" id="ShaderMaterial_5xxpu"] @@ -15,7 +15,7 @@ transparency = 1 shading_mode = 0 diffuse_mode = 3 specular_mode = 1 -albedo_texture = SubResource("ViewportTexture_5o5t4") +albedo_texture = SubResource("ViewportTexture_xy31o") billboard_mode = 1 [sub_resource type="QuadMesh" id="QuadMesh_iwcmf"] diff --git a/assets/characters/evilcoco/evilcoco.tscn b/assets/characters/evilcoco/evilcoco.tscn index 53232a7..6e752c1 100644 --- a/assets/characters/evilcoco/evilcoco.tscn +++ b/assets/characters/evilcoco/evilcoco.tscn @@ -32,7 +32,7 @@ max_value = 200.0 _data = [Vector2(0, 1), 0.0, 0.0, 0, 0, Vector2(0.56535, 83.9717), 420.727, 420.727, 0, 0, Vector2(0.729483, 200), 0.0, 0.0, 0, 0] point_count = 3 -[sub_resource type="ViewportTexture" id="ViewportTexture_uwa31"] +[sub_resource type="ViewportTexture" id="ViewportTexture_cfqc6"] viewport_path = NodePath("MeshInstance3D/SubViewport") [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_a31vv"] @@ -42,7 +42,7 @@ no_depth_test = true shading_mode = 0 diffuse_mode = 3 specular_mode = 1 -albedo_texture = SubResource("ViewportTexture_uwa31") +albedo_texture = SubResource("ViewportTexture_cfqc6") texture_filter = 0 texture_repeat = false billboard_mode = 1 diff --git a/assets/characters/megumi/megumi.tscn b/assets/characters/megumi/megumi.tscn new file mode 100644 index 0000000..6d8f150 --- /dev/null +++ b/assets/characters/megumi/megumi.tscn @@ -0,0 +1,121 @@ +[gd_scene load_steps=17 format=3 uid="uid://cj7k48mei62om"] + +[ext_resource type="Texture2D" uid="uid://dj20ug78dpiv7" path="res://assets/fx/questionmark.png" id="1_yklwq"] +[ext_resource type="Script" path="res://src/viewport.gd" id="2_hqn5a"] +[ext_resource type="SpineAtlasResource" uid="uid://cihrnyj2oc1ri" path="res://assets/characters/megumi/spine.atlas" id="3_y5njy"] +[ext_resource type="SpineSkeletonFileResource" uid="uid://dt8npmbm4bckf" path="res://assets/characters/megumi/spine.skel" id="4_icsgk"] +[ext_resource type="Script" path="res://src/spine_sprite.gd" id="5_g61qc"] + +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_s0iww"] +transparency = 1 +shading_mode = 0 +diffuse_mode = 3 +specular_mode = 2 +albedo_texture = ExtResource("1_yklwq") +billboard_mode = 3 +particles_anim_h_frames = 1 +particles_anim_v_frames = 1 +particles_anim_loop = false + +[sub_resource type="QuadMesh" id="QuadMesh_uqum3"] +material = SubResource("StandardMaterial3D_s0iww") +size = Vector2(0.1, 0.1) + +[sub_resource type="Curve" id="Curve_px5jj"] +min_value = -200.0 +max_value = 200.0 +_data = [Vector2(0, 149.721), 0.0, 0.0, 0, 0, Vector2(0.519757, 25.9576), -848.296, -848.296, 0, 0, Vector2(0.966565, -105.541), 0.0, 0.0, 0, 0] +point_count = 3 + +[sub_resource type="Curve" id="Curve_l10dy"] +max_value = 200.0 +_data = [Vector2(0, 1), 0.0, 0.0, 0, 0, Vector2(0.56535, 83.9717), 420.727, 420.727, 0, 0, Vector2(0.729483, 200), 0.0, 0.0, 0, 0] +point_count = 3 + +[sub_resource type="ViewportTexture" id="ViewportTexture_rdjkf"] +viewport_path = NodePath("MeshInstance3D/SubViewport") + +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_a31vv"] +transparency = 1 +blend_mode = 4 +no_depth_test = true +shading_mode = 0 +diffuse_mode = 3 +specular_mode = 1 +albedo_texture = SubResource("ViewportTexture_rdjkf") +texture_filter = 0 +texture_repeat = false +billboard_mode = 1 + +[sub_resource type="QuadMesh" id="QuadMesh_iwcmf"] +size = Vector2(2, 2) + +[sub_resource type="SpineSkeletonDataResource" id="SpineSkeletonDataResource_3qxbc"] +atlas_res = ExtResource("3_y5njy") +skeleton_file_res = ExtResource("4_icsgk") + +[sub_resource type="CanvasItemMaterial" id="CanvasItemMaterial_232ej"] + +[sub_resource type="CylinderShape3D" id="CylinderShape3D_wn1m5"] + +[sub_resource type="CylinderShape3D" id="CylinderShape3D_cbp6h"] + +[node name="NPC_Megumi" type="CharacterBody3D"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.48192, 0) +axis_lock_angular_x = true +axis_lock_angular_y = true +axis_lock_angular_z = true + +[node name="CPUParticles3D" type="CPUParticles3D" parent="."] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.0637626, 0.611801, 0) +visible = false +cast_shadow = 0 +gi_mode = 0 +amount = 1 +lifetime = 2.0 +preprocess = 3.0 +explosiveness = 0.5 +mesh = SubResource("QuadMesh_uqum3") +direction = Vector3(1, 1, 0) +spread = 90.0 +flatness = 1.0 +gravity = Vector3(0, 0.1, 0) +linear_accel_curve = SubResource("Curve_px5jj") +anim_speed_max = 60.44 +anim_speed_curve = SubResource("Curve_l10dy") + +[node name="MeshInstance3D" type="MeshInstance3D" parent="."] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.1, 0) +layers = 1023 +material_override = SubResource("StandardMaterial3D_a31vv") +cast_shadow = 0 +gi_mode = 2 +mesh = SubResource("QuadMesh_iwcmf") +script = ExtResource("2_hqn5a") + +[node name="SubViewport" type="SubViewport" parent="MeshInstance3D"] +transparent_bg = true +positional_shadow_atlas_quad_0 = 0 +canvas_cull_mask = 4294966273 +size = Vector2i(3000, 3000) + +[node name="SpineSprite" type="SpineSprite" parent="MeshInstance3D/SubViewport"] +light_mask = 0 +visibility_layer = 3 +position = Vector2(940, -20) +skeleton_data_res = SubResource("SpineSkeletonDataResource_3qxbc") +normal_material = SubResource("CanvasItemMaterial_232ej") +preview_skin = "default" +preview_animation = "animation" +preview_frame = false +preview_time = 0.733333 +script = ExtResource("5_g61qc") + +[node name="CollisionShape3D" type="CollisionShape3D" parent="."] +transform = Transform3D(0.3, 0, 0, 0, 0.3, 0, 0, 0, 0.3, 0, 0, 0) +shape = SubResource("CylinderShape3D_wn1m5") + +[node name="Area3D" type="Area3D" parent="." groups=["Player"]] + +[node name="CollisionShape3D" type="CollisionShape3D" parent="Area3D"] +shape = SubResource("CylinderShape3D_cbp6h") diff --git a/assets/characters/megumi/spine.atlas b/assets/characters/megumi/spine.atlas index 654af61..7e4c320 100644 --- a/assets/characters/megumi/spine.atlas +++ b/assets/characters/megumi/spine.atlas @@ -1,7 +1,7 @@ spine.png -size:377,950 +size:377,957 filter:Linear,Linear scale:0.5 BASE -bounds:2,2,373,946 -offsets:0,0,374,946 +bounds:2,2,373,953 +offsets:0,0,374,953 diff --git a/assets/characters/megumi/spine.png b/assets/characters/megumi/spine.png index 2a09223..312f0b0 100644 Binary files a/assets/characters/megumi/spine.png and b/assets/characters/megumi/spine.png differ diff --git a/assets/characters/megumi/spine.skel b/assets/characters/megumi/spine.skel index dac4f5c..ff8c392 100644 Binary files a/assets/characters/megumi/spine.skel and b/assets/characters/megumi/spine.skel differ diff --git a/assets/characters/pasadena/npc.tscn b/assets/characters/pasadena/npc.tscn index 55e2414..ea6dcff 100644 --- a/assets/characters/pasadena/npc.tscn +++ b/assets/characters/pasadena/npc.tscn @@ -32,7 +32,7 @@ max_value = 200.0 _data = [Vector2(0, 1), 0.0, 0.0, 0, 0, Vector2(0.56535, 83.9717), 420.727, 420.727, 0, 0, Vector2(0.729483, 200), 0.0, 0.0, 0, 0] point_count = 3 -[sub_resource type="ViewportTexture" id="ViewportTexture_3u0i2"] +[sub_resource type="ViewportTexture" id="ViewportTexture_l7lc7"] viewport_path = NodePath("MeshInstance3D/SubViewport") [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_a31vv"] @@ -41,7 +41,7 @@ blend_mode = 4 shading_mode = 0 diffuse_mode = 3 specular_mode = 1 -albedo_texture = SubResource("ViewportTexture_3u0i2") +albedo_texture = SubResource("ViewportTexture_l7lc7") texture_filter = 0 texture_repeat = false billboard_mode = 1 @@ -103,7 +103,6 @@ size = Vector2i(3000, 3000) [node name="SpineSprite" type="SpineSprite" parent="MeshInstance3D/SubViewport"] position = Vector2(42, -207) skeleton_data_res = SubResource("SpineSkeletonDataResource_ufcij") -meshes = true preview_skin = "default" preview_animation = "animation" preview_frame = true diff --git a/assets/characters/player.gd b/assets/characters/player.gd index 86f741c..7fc4dea 100644 --- a/assets/characters/player.gd +++ b/assets/characters/player.gd @@ -17,11 +17,11 @@ func _physics_process(delta: float) -> void: Messagebus.DEBUG_XYZ.emit(self.global_transform.origin) - if Input.is_key_pressed(KEY_SPACE) and is_on_floor(): + if Input.is_action_just_pressed("jump") and is_on_floor(): self.velocity.y = delta * JUMP_VELOCITY - var i = int(Input.get_axis("move_left", "move_right")) - if i: - last_direction = Vector3(i, 1, 1) + var i = Input.get_axis("move_left", "move_right") + if snapped(i, 1): + last_direction = Vector3(sign(i), 1, 1) var t: Material = $MeshInstance3D.material_override t.uv1_scale = last_direction @@ -33,11 +33,9 @@ func _physics_process(delta: float) -> void: camera.position.z = position.z + 4 func _unhandled_input(event: InputEvent) -> void: - if event is InputEventMouseButton: - if event.is_pressed(): - if event.button_index == MOUSE_BUTTON_WHEEL_UP: - camera.fov -= 1 * (5 if Input.is_key_pressed(KEY_SHIFT) else 1) - camera.size -= 1 * (0.2 if Input.is_key_pressed(KEY_SHIFT) else 0.05) - if event.button_index == MOUSE_BUTTON_WHEEL_DOWN: - camera.fov += 1 * (5 if Input.is_key_pressed(KEY_SHIFT) else 1) - camera.size += 1 * (0.2 if Input.is_key_pressed(KEY_SHIFT) else 0.05) + if Input.is_action_pressed("zoom_in"): + camera.fov -= 1 * (5 if Input.is_key_pressed(KEY_SHIFT) else 1) + camera.size -= 1 * (0.2 if Input.is_key_pressed(KEY_SHIFT) else 0.05) + if Input.is_action_pressed("zoom_out"): + camera.fov += 1 * (5 if Input.is_key_pressed(KEY_SHIFT) else 1) + camera.size += 1 * (0.2 if Input.is_key_pressed(KEY_SHIFT) else 0.05) diff --git a/assets/characters/tawna/tawna.gd b/assets/characters/tawna/tawna.gd index 2f1b17f..dfa75ca 100644 --- a/assets/characters/tawna/tawna.gd +++ b/assets/characters/tawna/tawna.gd @@ -6,17 +6,14 @@ const ACCEL = 4.5 @onready var nav: NavigationAgent3D = $NavigationAgent3D @export var target: CharacterBody3D = null -#func _ready() -> void: - #pass - func _physics_process(delta: float) -> void: if not target: return nav.set_target_position(target.global_position) var current_location = global_transform.origin var next_location = nav.get_next_path_position() - var new_velocity = (next_location - current_location).normalized() * SPEED - if !new_velocity.is_zero_approx(): + var dist = next_location - current_location + var new_velocity = dist.normalized() * SPEED + if dist.length() > 0.5: velocity = new_velocity - print(velocity) move_and_slide() diff --git a/assets/characters/tawna/tawna.tscn b/assets/characters/tawna/tawna.tscn index a605e36..847868d 100644 --- a/assets/characters/tawna/tawna.tscn +++ b/assets/characters/tawna/tawna.tscn @@ -33,7 +33,7 @@ max_value = 200.0 _data = [Vector2(0, 1), 0.0, 0.0, 0, 0, Vector2(0.56535, 83.9717), 420.727, 420.727, 0, 0, Vector2(0.729483, 200), 0.0, 0.0, 0, 0] point_count = 3 -[sub_resource type="ViewportTexture" id="ViewportTexture_k4oap"] +[sub_resource type="ViewportTexture" id="ViewportTexture_tg7lx"] viewport_path = NodePath("MeshInstance3D/SubViewport") [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_a31vv"] @@ -41,7 +41,7 @@ transparency = 1 shading_mode = 0 diffuse_mode = 3 specular_mode = 1 -albedo_texture = SubResource("ViewportTexture_k4oap") +albedo_texture = SubResource("ViewportTexture_tg7lx") billboard_mode = 1 [sub_resource type="QuadMesh" id="QuadMesh_iwcmf"] @@ -69,6 +69,8 @@ script = ExtResource("1_mbfmt") [node name="NavigationAgent3D" type="NavigationAgent3D" parent="."] avoidance_enabled = true +debug_enabled = true +debug_path_custom_color = Color(0.824113, 2.88785e-07, 0.434997, 1) [node name="CPUParticles3D" type="CPUParticles3D" parent="."] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.0637626, 0.611801, 0) diff --git a/assets/levels/level_1.gd b/assets/levels/level_1.gd index e1c8c02..223bc98 100644 --- a/assets/levels/level_1.gd +++ b/assets/levels/level_1.gd @@ -1,10 +1,10 @@ extends Node3D @onready var tawna: CharacterBody3D = $NPC_Tawna; -@export var player: CharacterBody3D = null; +@onready var player: CharacterBody3D = $NPC_Coco; func _ready() -> void: - tawna = $NPC_Tawna + print(get_parent_node_3d()) tawna.target = player func _process(delta: float) -> void: diff --git a/assets/levels/maps/debug1.tscn b/assets/levels/maps/debug1.tscn index 27f967c..b150e48 100644 --- a/assets/levels/maps/debug1.tscn +++ b/assets/levels/maps/debug1.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=34 format=3 uid="uid://b2b0sgltiefki"] +[gd_scene load_steps=35 format=3 uid="uid://b2b0sgltiefki"] [ext_resource type="Script" path="res://assets/levels/level_1.gd" id="1_irx2k"] [ext_resource type="Shader" path="res://assets/objects/box/box.gdshader" id="2_lq1r3"] @@ -16,14 +16,16 @@ [ext_resource type="Texture2D" uid="uid://bteibup5xcwah" path="res://assets/objects/kenney_nature-kit/Isometric/cliff_blockSlopeWalls_rock_NE.png" id="15_rqu8f"] [ext_resource type="PackedScene" uid="uid://dsr0pdtda86ix" path="res://assets/characters/tawna/tawna.tscn" id="16_e5ajb"] [ext_resource type="PackedScene" uid="uid://da0mv3cisoubi" path="res://assets/objects/switch/switch.tscn" id="17_1yuu1"] +[ext_resource type="PackedScene" uid="uid://cj7k48mei62om" path="res://assets/characters/megumi/megumi.tscn" id="18_5v3lx"] [ext_resource type="PackedScene" uid="uid://b2maarsg7u3po" path="res://assets/characters/coco/npc_coco.tscn" id="18_tn7yc"] [sub_resource type="Environment" id="Environment_06i34"] background_mode = 1 -background_color = Color(0.62307, 0.184048, 0.272975, 1) +background_color = Color(0.764667, 0.252225, 0.351088, 1) sky_custom_fov = 1.5 ambient_light_source = 1 reflected_light_source = 1 +adjustment_enabled = true [sub_resource type="ShaderMaterial" id="ShaderMaterial_okcrm"] render_priority = 0 @@ -61,14 +63,14 @@ data = PackedVector3Array(5, 0, 5, -5, 0, 5, 5, 0, -5, -5, 0, 5, -5, 0, -5, 5, 0 vertices = PackedVector3Array(1.56663, 0.279793, -3.25, 1.56663, 0.279793, -2.75, 2.31663, 0.279793, -2.5, 4.31663, 0.279793, -3.25, 2.31663, 0.279793, -1.5, 1.56663, 0.279793, 2.5, 8.31663, 0.279793, 2.5, 8.31663, 0.279793, -4.5, 1.56663, 0.279793, -1.25, 4.31663, 0.279793, -4.5, 0.81663, 0.279793, -2.5, -5.68337, 0.279793, -3.25, 0.81663, 0.279793, -1.5, -5.68337, 0.279793, 2.5) polygons = [PackedInt32Array(1, 0, 2), PackedInt32Array(2, 0, 3), PackedInt32Array(4, 3, 5), PackedInt32Array(5, 3, 6), PackedInt32Array(6, 3, 7), PackedInt32Array(4, 2, 3), PackedInt32Array(5, 8, 4), PackedInt32Array(3, 9, 7), PackedInt32Array(1, 10, 0), PackedInt32Array(0, 10, 11), PackedInt32Array(8, 5, 12), PackedInt32Array(12, 5, 13), PackedInt32Array(12, 13, 11), PackedInt32Array(11, 10, 12)] -[sub_resource type="ViewportTexture" id="ViewportTexture_y6vs7"] +[sub_resource type="ViewportTexture" id="ViewportTexture_3u6tt"] viewport_path = NodePath("NavigationRegion3D/MeshInstance3D/SubViewport") [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_mdr1l"] transparency = 2 alpha_scissor_threshold = 0.5 alpha_antialiasing_mode = 0 -albedo_texture = SubResource("ViewportTexture_y6vs7") +albedo_texture = SubResource("ViewportTexture_3u6tt") metallic_specular = 0.0 [sub_resource type="ShaderMaterial" id="ShaderMaterial_lrfyr"] @@ -178,19 +180,21 @@ environment = SubResource("Environment_06i34") [node name="DirectionalLight3D" type="DirectionalLight3D" parent="."] transform = Transform3D(0.990369, 0.119902, -0.0692253, 0, 0.499998, 0.866027, 0.138451, -0.857686, 0.495183, 0, 2.5003, 2.77581) -light_energy = 0.6 shadow_enabled = true directional_shadow_max_distance = 54.0 [node name="NPC_Tawna" parent="." node_paths=PackedStringArray("target") instance=ExtResource("16_e5ajb")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.326665, 0.480017, 0.00148714) -target = NodePath("../NPC_Coco") +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.833128, 0.480017, 1.21881) +target = NodePath("../NPC_Pasadena") [node name="NPC_EvilCoco" parent="." instance=ExtResource("12_o5554")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1, 0.421477, 0) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.446828, 0.421477, 0) [node name="NPC_Pasadena" parent="." instance=ExtResource("8_s3ti8")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.565993, 0.48192, -0.421152) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.43713, 0.48192, -0.421152) + +[node name="NPC_Megumi" parent="." instance=ExtResource("18_5v3lx")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2.36378, 0.154416, 0.308182) [node name="NPC_Coco" parent="." instance=ExtResource("18_tn7yc")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.99698, 0.48192, -1.00017) diff --git a/project.godot b/project.godot index 9974cd9..85eba8f 100644 --- a/project.godot +++ b/project.godot @@ -44,21 +44,25 @@ enabled=PackedStringArray("res://addons/Todo_Manager/plugin.cfg", "res://addons/ move_forward={ "deadzone": 0.5, "events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":87,"key_label":0,"unicode":119,"location":0,"echo":false,"script":null) +, Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":-1,"axis":1,"axis_value":-1.0,"script":null) ] } move_left={ "deadzone": 0.5, "events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":65,"key_label":0,"unicode":97,"location":0,"echo":false,"script":null) +, Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":-1,"axis":0,"axis_value":-1.0,"script":null) ] } move_right={ "deadzone": 0.5, "events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":68,"key_label":0,"unicode":100,"location":0,"echo":false,"script":null) +, Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":-1,"axis":0,"axis_value":1.0,"script":null) ] } move_back={ "deadzone": 0.5, "events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":83,"key_label":0,"unicode":115,"location":0,"echo":false,"script":null) +, Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":-1,"axis":1,"axis_value":1.0,"script":null) ] } quentincaffeino_console_toggle={ @@ -81,6 +85,24 @@ quentincaffeino_console_history_down={ "events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":0,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null) ] } +jump={ +"deadzone": 0.5, +"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":32,"key_label":0,"unicode":32,"location":0,"echo":false,"script":null) +, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"button_index":0,"pressure":0.0,"pressed":true,"script":null) +] +} +zoom_in={ +"deadzone": 0.5, +"events": [Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":-1,"axis":3,"axis_value":-1.0,"script":null) +, Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"button_mask":8,"position":Vector2(330, 0),"global_position":Vector2(344, 70),"factor":1.0,"button_index":4,"canceled":false,"pressed":true,"double_click":false,"script":null) +] +} +zoom_out={ +"deadzone": 0.5, +"events": [Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":-1,"axis":3,"axis_value":1.0,"script":null) +, Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"button_mask":16,"position":Vector2(261, 10),"global_position":Vector2(275, 80),"factor":1.0,"button_index":5,"canceled":false,"pressed":true,"double_click":false,"script":null) +] +} [input_devices] diff --git a/src/level_manager.gd b/src/level_manager.gd index 7f3dc0a..2ebaa49 100644 --- a/src/level_manager.gd +++ b/src/level_manager.gd @@ -4,8 +4,6 @@ var CURRENT_LEVEL: Node3D = null var CURRENT_PLAYER: CharacterBody3D = null var combined_signal : Observable -signal TestSignal - func _ready() -> void: var lvl: Resource = load("res://assets/levels/maps/debug1.tscn") var player: Resource = load("res://assets/characters/coco/coco.tscn")