diff --git a/Player.tscn490676094.tmp b/Player.tscn490676094.tmp new file mode 100644 index 0000000..09711a6 --- /dev/null +++ b/Player.tscn490676094.tmp @@ -0,0 +1,52 @@ +[gd_scene format=3 uid="uid://crtm0xtiql3r8"] + +[ext_resource type="Script" uid="uid://bn777gguclud5" path="res://player.gd" id="1_xhfnw"] +[ext_resource type="Script" uid="uid://cpyq2r5cq653g" path="res://camera_iso.gd" id="2_camera_iso"] +[ext_resource type="PackedScene" uid="uid://bun14xmk20pcj" path="res://Assets/bull.fbx" id="4_e80uo"] + +[sub_resource type="CapsuleShape3D" id="CapsuleShape3D_kne1u"] +radius = 0.7495117 +height = 1.845398 + +[node name="Player" type="CharacterBody3D" unique_id=165510044] +collision_layer = 2 +collision_mask = 9 +script = ExtResource("1_xhfnw") + +[node name="CollisionBull" type="CollisionShape3D" parent="." unique_id=571780801] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.29183745, 0.3197594) +shape = SubResource("CapsuleShape3D_kne1u") + +[node name="Camera3D" type="Camera3D" parent="." unique_id=1120161087] +script = ExtResource("2_camera_iso") + +[node name="bull" parent="." unique_id=1386495166 instance=ExtResource("4_e80uo")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.655, 0.23) + +[node name="Skeleton3D" parent="bull/Armature" parent_id_path=PackedInt32Array(1386495166, 1942410469) index="0" unique_id=550138996] +bones/0/position = Vector3(0, 0, 0.009963839) +bones/0/rotation = Quaternion(0.7071068, 0, 0, 0.7071067) +bones/0/scale = Vector3(1, 1, 1) +bones/1/position = Vector3(0.003526625, -0.0043296535, 0.0040827994) +bones/1/rotation = Quaternion(-0.00038647873, 0.06909673, 0.9868542, -0.14609687) +bones/2/rotation = Quaternion(-0.06929122, 3.2175163e-07, -0.112670615, 0.99121344) +bones/4/position = Vector3(0.0045358227, -0.002137695, -0.004238624) +bones/4/rotation = Quaternion(-0.24948503, 0.19590352, 0.9416978, -0.11217985) +bones/4/scale = Vector3(1.0000001, 0.9999999, 1.0000001) +bones/5/rotation = Quaternion(-0.58943665, -0.3660725, -0.22564478, 0.683842) +bones/5/scale = Vector3(1, 1.0000001, 0.99999994) +bones/6/rotation = Quaternion(0.52910197, 0.15997827, 0.120245, 0.8246207) +bones/6/scale = Vector3(1, 1, 1.0000001) +bones/17/position = Vector3(0, 0.0009373814, 0.007552617) +bones/17/rotation = Quaternion(-9.4156974e-08, 0.7071068, 0.7071067, -9.4156974e-08) +bones/19/position = Vector3(-0.003526625, -0.0043296535, 0.0040827994) +bones/19/rotation = Quaternion(0.00038647873, 0.06909673, 0.9868542, 0.14609687) +bones/20/rotation = Quaternion(-0.06929122, -3.2227587e-07, 0.11267061, 0.99121344) +bones/22/position = Vector3(-0.0045358227, -0.002137695, -0.004238624) +bones/22/rotation = Quaternion(0.24948503, 0.19590352, 0.9416978, 0.11217985) +bones/23/rotation = Quaternion(-0.58943665, 0.3660725, 0.22564478, 0.683842) +bones/23/scale = Vector3(1, 1.0000001, 1) +bones/24/rotation = Quaternion(0.529102, -0.15997836, -0.120245025, 0.82462066) +bones/24/scale = Vector3(1, 1.0000001, 1) + +[editable path="bull"] diff --git a/Player.tscn514452151.tmp b/Player.tscn514452151.tmp new file mode 100644 index 0000000..09711a6 --- /dev/null +++ b/Player.tscn514452151.tmp @@ -0,0 +1,52 @@ +[gd_scene format=3 uid="uid://crtm0xtiql3r8"] + +[ext_resource type="Script" uid="uid://bn777gguclud5" path="res://player.gd" id="1_xhfnw"] +[ext_resource type="Script" uid="uid://cpyq2r5cq653g" path="res://camera_iso.gd" id="2_camera_iso"] +[ext_resource type="PackedScene" uid="uid://bun14xmk20pcj" path="res://Assets/bull.fbx" id="4_e80uo"] + +[sub_resource type="CapsuleShape3D" id="CapsuleShape3D_kne1u"] +radius = 0.7495117 +height = 1.845398 + +[node name="Player" type="CharacterBody3D" unique_id=165510044] +collision_layer = 2 +collision_mask = 9 +script = ExtResource("1_xhfnw") + +[node name="CollisionBull" type="CollisionShape3D" parent="." unique_id=571780801] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.29183745, 0.3197594) +shape = SubResource("CapsuleShape3D_kne1u") + +[node name="Camera3D" type="Camera3D" parent="." unique_id=1120161087] +script = ExtResource("2_camera_iso") + +[node name="bull" parent="." unique_id=1386495166 instance=ExtResource("4_e80uo")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.655, 0.23) + +[node name="Skeleton3D" parent="bull/Armature" parent_id_path=PackedInt32Array(1386495166, 1942410469) index="0" unique_id=550138996] +bones/0/position = Vector3(0, 0, 0.009963839) +bones/0/rotation = Quaternion(0.7071068, 0, 0, 0.7071067) +bones/0/scale = Vector3(1, 1, 1) +bones/1/position = Vector3(0.003526625, -0.0043296535, 0.0040827994) +bones/1/rotation = Quaternion(-0.00038647873, 0.06909673, 0.9868542, -0.14609687) +bones/2/rotation = Quaternion(-0.06929122, 3.2175163e-07, -0.112670615, 0.99121344) +bones/4/position = Vector3(0.0045358227, -0.002137695, -0.004238624) +bones/4/rotation = Quaternion(-0.24948503, 0.19590352, 0.9416978, -0.11217985) +bones/4/scale = Vector3(1.0000001, 0.9999999, 1.0000001) +bones/5/rotation = Quaternion(-0.58943665, -0.3660725, -0.22564478, 0.683842) +bones/5/scale = Vector3(1, 1.0000001, 0.99999994) +bones/6/rotation = Quaternion(0.52910197, 0.15997827, 0.120245, 0.8246207) +bones/6/scale = Vector3(1, 1, 1.0000001) +bones/17/position = Vector3(0, 0.0009373814, 0.007552617) +bones/17/rotation = Quaternion(-9.4156974e-08, 0.7071068, 0.7071067, -9.4156974e-08) +bones/19/position = Vector3(-0.003526625, -0.0043296535, 0.0040827994) +bones/19/rotation = Quaternion(0.00038647873, 0.06909673, 0.9868542, 0.14609687) +bones/20/rotation = Quaternion(-0.06929122, -3.2227587e-07, 0.11267061, 0.99121344) +bones/22/position = Vector3(-0.0045358227, -0.002137695, -0.004238624) +bones/22/rotation = Quaternion(0.24948503, 0.19590352, 0.9416978, 0.11217985) +bones/23/rotation = Quaternion(-0.58943665, 0.3660725, 0.22564478, 0.683842) +bones/23/scale = Vector3(1, 1.0000001, 1) +bones/24/rotation = Quaternion(0.529102, -0.15997836, -0.120245025, 0.82462066) +bones/24/scale = Vector3(1, 1.0000001, 1) + +[editable path="bull"] diff --git a/addons/rider-plugin/bin/windows/~rider-gdextension.windows.editor.x86_64.dll~RFc620b01.TMP b/addons/rider-plugin/bin/windows/~rider-gdextension.windows.editor.x86_64.dll~RFc620b01.TMP new file mode 100644 index 0000000..31e7384 Binary files /dev/null and b/addons/rider-plugin/bin/windows/~rider-gdextension.windows.editor.x86_64.dll~RFc620b01.TMP differ diff --git a/debug_params.gd b/debug_params.gd index 6e0a3c5..a5e1203 100644 --- a/debug_params.gd +++ b/debug_params.gd @@ -20,6 +20,8 @@ func _ready() -> void: func _register_all() -> void: + #Gamepad vibration + _reg_b("Gamepad", "gamepad_vibration", true) #Level Unlocking _reg_b("Gate", "gate_unlocked_bear", false) # ── Movement ────────────────────────────────────────────────────────────── diff --git a/player.gd b/player.gd index 8207784..5f13b49 100644 --- a/player.gd +++ b/player.gd @@ -1184,7 +1184,8 @@ func take_sword_hit(cause: String = "", hit_pos: Vector3 = Vector3.ZERO) -> void hit_taken.emit(cause) camera_pivot.call(&"trigger_hit", 0.7) # Vibrate controller 0 with half weak strength, full strong strength, for 0.5 seconds - Input.start_joy_vibration(0, 0.5, 1, 0.2) + if DP.b("gamepad_vibration"): + Input.start_joy_vibration(0, 0.5, 1, 0.2) # A spear gores a spot — blood spurts from the entry wound (where it struck the # bull). Melee gores pass no position and skip the spurt; gore can be turned off.