From 478a16f72bd02029ba0921da64750029057bb978 Mon Sep 17 00:00:00 2001 From: vengefulcartographer <76922012+vengefulcartographer@users.noreply.github.com> Date: Sun, 20 Aug 2023 11:00:14 -0600 Subject: [PATCH 1/2] moved holster up --- godot/Level/Island.tscn | 2 +- godot/player.tscn | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/godot/Level/Island.tscn b/godot/Level/Island.tscn index 5ecebbd..5c70f0a 100644 --- a/godot/Level/Island.tscn +++ b/godot/Level/Island.tscn @@ -23,7 +23,7 @@ [ext_resource type="PackedScene" uid="uid://c4s6y758n77lw" path="res://villager_shared.tscn" id="24_ddfvk"] [ext_resource type="PackedScene" uid="uid://b3aus2kigf8xt" path="res://Models/beach_decor/cooler.tscn" id="24_sl7ne"] [ext_resource type="PackedScene" uid="uid://cft26nug7kyqb" path="res://ambient_light_1.tscn" id="25_novxt"] -[ext_resource type="PackedScene" uid="uid://ukful430mmkn" path="res://color_cube.tscn" id="25_rm0cr"] +[ext_resource type="PackedScene" path="res://color_cube.tscn" id="25_rm0cr"] [ext_resource type="PackedScene" uid="uid://bw3k2c75qavce" path="res://Models/beach_decor/bucket.tscn" id="27_f3p1i"] [ext_resource type="PackedScene" uid="uid://g4gmc0pwlak1" path="res://Models/buildings/fence.tscn" id="28_prydb"] diff --git a/godot/player.tscn b/godot/player.tscn index 9ae38a9..3ee6e9e 100644 --- a/godot/player.tscn +++ b/godot/player.tscn @@ -9,6 +9,7 @@ radius = 0.0669067 height = 0.43 [sub_resource type="SphereShape3D" id="SphereShape3D_6l1w6"] +radius = 0.693547 [node name="Player" type="CharacterBody3D"] script = ExtResource("1_7gpdp") @@ -33,7 +34,7 @@ script = ExtResource("3_a68da") [node name="Area3D" type="Area3D" parent="Holster"] [node name="CollisionShape3D" type="CollisionShape3D" parent="Holster/Area3D"] -transform = Transform3D(0.1, 0, 0, 0, 0.1, 0, 0, 0, 0.1, 0, 0, 0) +transform = Transform3D(0.1, 0, 0, 0, 0.1, 0, 0, 0, 0.1, 0, 0.0672282, 0) shape = SubResource("SphereShape3D_6l1w6") [connection signal="anim_check_grab" from="grape_man" to="." method="_on_grape_man_anim_check_grab"] From 32f6f40e3be284fca3011a2f75689b1a54333d3e Mon Sep 17 00:00:00 2001 From: vengefulcartographer <76922012+vengefulcartographer@users.noreply.github.com> Date: Sun, 20 Aug 2023 11:19:59 -0600 Subject: [PATCH 2/2] input fiddling --- godot/Models/grape_man.tscn | 5 ++++- godot/Player.gd | 8 ++++++-- godot/project.godot | 31 +++++++++++++++++++++++++++++++ 3 files changed, 41 insertions(+), 3 deletions(-) diff --git a/godot/Models/grape_man.tscn b/godot/Models/grape_man.tscn index 34b587d..56ec005 100644 --- a/godot/Models/grape_man.tscn +++ b/godot/Models/grape_man.tscn @@ -154,7 +154,7 @@ transform = Transform3D(0.065, 0, 0, 0, 0.065, 0, 0, 0, 0.065, 0, 0, 0) script = ExtResource("2_ksje8") [node name="Skeleton3D" parent="rig" index="0"] -bones/0/rotation = Quaternion(0.104001, 0, 0, 0.994577) +bones/0/rotation = Quaternion(0.0838794, 0, 0, 0.996476) bones/1/rotation = Quaternion(-0.0891896, 1.18734e-07, -1.06322e-08, 0.996015) bones/2/rotation = Quaternion(0.0133933, -1.19199e-07, 1.5966e-09, 0.99991) bones/3/rotation = Quaternion(-0.00997737, 0.100365, -0.694951, 0.711948) @@ -190,3 +190,6 @@ stream = ExtResource("5_b32re") [node name="sad" type="AudioStreamPlayer" parent="." index="7"] stream = ExtResource("6_qe4bi") + +[node name="woohoo" type="AudioStreamPlayer" parent="." index="8"] +stream = ExtResource("6_qe4bi") diff --git a/godot/Player.gd b/godot/Player.gd index 3f83770..d7465f9 100644 --- a/godot/Player.gd +++ b/godot/Player.gd @@ -36,7 +36,7 @@ func _input(event): var roty = deg_to_rad(event.relative.x * horiz_sens) $grape_man.rotate_y(roty) $CameraMount.global_rotation.x = clampf($CameraMount.global_rotation.x, deg_to_rad(-60), deg_to_rad(-11)) - + if Input.is_action_just_pressed("ui_accept"): var obj = holding.get_ref() if obj: @@ -46,7 +46,11 @@ func _input(event): $grape_man/pickup.play() $grape_man.pickup() - + if Input.is_action_just_pressed("Pause"): + pass + + if Input.is_action_just_pressed("Woohoo"): + pass func _physics_process(delta): diff --git a/godot/project.godot b/godot/project.godot index 02bc7ed..9a16e84 100644 --- a/godot/project.godot +++ b/godot/project.godot @@ -33,6 +33,25 @@ import/fbx/enabled=false [input] +ui_accept={ +"deadzone": 0.5, +"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":4194309,"physical_keycode":0,"key_label":0,"unicode":0,"echo":false,"script":null) +, 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":4194310,"physical_keycode":0,"key_label":0,"unicode":0,"echo":false,"script":null) +, 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":32,"physical_keycode":0,"key_label":0,"unicode":32,"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) +] +} +ui_select={ +"deadzone": 0.5, +"events": [Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":3,"pressure":0.0,"pressed":false,"script":null) +, 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":32,"physical_keycode":0,"key_label":0,"unicode":32,"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) +] +} +ui_cancel={ +"deadzone": 0.5, +"events": [] +} ui_left={ "deadzone": 0.5, "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":4194319,"physical_keycode":0,"key_label":0,"unicode":0,"echo":false,"script":null) @@ -65,3 +84,15 @@ ui_down={ , 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,"echo":false,"script":null) ] } +Woohoo={ +"deadzone": 0.5, +"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":69,"key_label":0,"unicode":0,"echo":false,"script":null) +, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"button_index":3,"pressure":0.0,"pressed":false,"script":null) +] +} +Pause={ +"deadzone": 0.5, +"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":4194305,"key_label":0,"unicode":0,"echo":false,"script":null) +, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"button_index":6,"pressure":0.0,"pressed":false,"script":null) +] +}