tweaked machete

GameModes/cookie_mode.tres

@@ -21,6 +21,7 @@ time_slowed_speed = 3.0
 stamina_regen = true
 max_stamina = 100.0
 stamina_drain = 20.0
+stamina_gain = 5.0
 air_dash_max = 1
 load_save = false
 money_multiplier = 3.0

GameModes/hubworld.tres

@@ -21,6 +21,7 @@ time_slowed_speed = 0.1
 stamina_regen = true
 max_stamina = 100.0
 stamina_drain = 20.0
+stamina_gain = 5.0
 air_dash_max = 1
 load_save = false
 money_multiplier = 1.0

GameModes/standard.tres

@@ -18,9 +18,10 @@ jump_velocity = 5
 dash_speed = 40
 gravity = -9.8
 time_slowed_speed = 0.1
-stamina_regen = false
+stamina_regen = true
 max_stamina = 100.0
 stamina_drain = 20.0
+stamina_gain = 5.0
 air_dash_max = 1
 load_save = false
 money_multiplier = 1.0

assets/machete.tscn

@@ -14,6 +14,10 @@
 [ext_resource type="AudioStream" uid="uid://cc6qqjl8yq5hw" path="res://assets/Audio/Foley Sports/Tennis/Generic Swing Powerful.wav" id="11_muqkq"]
 [ext_resource type="Script" uid="uid://dij338ar58dw1" path="res://scripts/melee_collision.gd" id="12_u0mbp"]
 
+[sub_resource type="BoxShape3D" id="BoxShape3D_idjup"]
+margin = 0.0
+size = Vector3(1.168, 0.787, 1.336)
+
 [sub_resource type="ShaderMaterial" id="ShaderMaterial_t68e8"]
 resource_name = "machete.blade"
 render_priority = 0
@@ -110,10 +114,6 @@ _surfaces = [{
 blend_shape_mode = 0
 shadow_mesh = SubResource("ArrayMesh_g3fr5")
 
-[sub_resource type="BoxShape3D" id="BoxShape3D_idjup"]
-margin = 0.0
-size = Vector3(0.153, 0.142, 1.336)
-
 [sub_resource type="Animation" id="Animation_bmneo"]
 length = 0.001
 tracks/0/type = "position_3d"
@@ -178,7 +178,7 @@ tracks/2/path = NodePath(".")
 tracks/2/interp = 1
 tracks/2/loop_wrap = true
 tracks/2/keys = {
-"times": PackedFloat32Array(0, 0.8),
+"times": PackedFloat32Array(0.166667, 0.566667),
 "transitions": PackedFloat32Array(1, 1),
 "values": [{
 "args": [],
@@ -268,7 +268,17 @@ script = ExtResource("1_3j502")
 weapon_info = ExtResource("2_vu874")
 anim_player = NodePath("AnimationPlayer")
 audio_fire = NodePath("Audio/Swing")
-melee_collision_shape = NodePath("MacheteHandle/Area3D/CollisionShape3D")
+melee_collision_shape = NodePath("CollisionShape/CollisionShape3D")
+
+[node name="CollisionShape" type="StaticBody3D" parent="."]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.567666, 0.415, -0.0427188)
+collision_layer = 128
+collision_mask = 232
+script = ExtResource("12_u0mbp")
+
+[node name="CollisionShape3D" type="CollisionShape3D" parent="CollisionShape"]
+transform = Transform3D(0.999996, 1.10134e-12, 1.01328e-06, 1.68754e-13, 1, -2.62013e-13, -1.01328e-06, 2.48689e-14, 0.999996, -0.00144231, 0, -0.410399)
+shape = SubResource("BoxShape3D_idjup")
 
 [node name="MacheteHandle" type="Node3D" parent="."]
 
@@ -278,25 +288,9 @@ cast_shadow = 0
 mesh = SubResource("ArrayMesh_io6u4")
 skeleton = NodePath("")
 
-[node name="Area3D" type="RigidBody3D" parent="MacheteHandle"]
-transform = Transform3D(-4.37114e-08, -1, 4.37114e-08, 0.314307, -5.5235e-08, -0.949321, 0.949321, -2.77573e-08, 0.314307, 0, 0.415, -0.0427188)
-collision_layer = 128
-collision_mask = 232
-gravity_scale = 0.0
-script = ExtResource("12_u0mbp")
-
-[node name="CollisionShape3D" type="CollisionShape3D" parent="MacheteHandle/Area3D"]
-transform = Transform3D(0.999998, 1.10134e-12, 1.01328e-06, 1.68754e-13, 1, -2.62013e-13, -1.01328e-06, 2.4869e-14, 0.999998, -0.00144234, 6.34256e-09, 0.143659)
-shape = SubResource("BoxShape3D_idjup")
-
-[node name="blade_ray" type="RayCast3D" parent="MacheteHandle"]
-transform = Transform3D(-0.284734, 0.0187224, 0.958423, 0.28306, -0.953586, 0.102721, 0.915862, 0.300539, 0.266218, 0, -0.135443, 0.144432)
-target_position = Vector3(0, -1.5, 0)
-collision_mask = 249
-
 [node name="AnimationPlayer" type="AnimationPlayer" parent="."]
 libraries = {
-"": SubResource("AnimationLibrary_gmno4")
+&"": SubResource("AnimationLibrary_gmno4")
 }
 
 [node name="Audio" type="Node3D" parent="."]

scenes/HUBWORLD.tscn

@@ -2154,8 +2154,6 @@ gamemode = ExtResource("2_62iy8")
 [node name="LEVEL UTILS" type="Node" parent="."]
 
 [node name="Playlist Generator" parent="LEVEL UTILS" instance=ExtResource("3_udqcb")]
-generate_playlist_now = false
-checksum_test = false
 
 [node name="PlaylistLoader" type="Node" parent="LEVEL UTILS"]
 script = ExtResource("3_2u2e7")

scripts/melee_collision.gd

@@ -2,7 +2,7 @@ extends Node
 
 var bullet_damage
 
-@onready var machete: Node3D = $"../.."
+@onready var machete: weapon = $".."
 
 
 # Called when the node enters the scene tree for the first time.