ButtSlide Rewrite

entities/player/mario/mario.tscn

@@ -440,7 +440,7 @@ animations = [{
 "speed": 5.0
 }]
 
-[sub_resource type="Resource" id="Resource_nxfaa"]
+[sub_resource type="Resource" id="Resource_kuq6s"]
 resource_local_to_scene = true
 script = ExtResource("23_bbld7")
 doll_path = NodePath("Doll")
@@ -450,19 +450,18 @@ frame_offsets = Dictionary[int, Vector2i]({
 0: Vector2i(0, 0)
 })
 frame_fludd = Dictionary[int, String]({
-0: "rot_y090",
-1: "rot_y090"
+0: "default"
 })
 frame_fludd_offsets = Dictionary[int, Vector2i]({
-0: Vector2i(1, 1),
-1: Vector2i(1, 2)
+0: Vector2i(0, 6),
+1: Vector2i(0, 7)
 })
-animation = "die"
+animation = "butt_slide_forwards"
 frame = 0
 preview = false
 frame_offset = Vector2i(0, 0)
-fludd_animation = "rot_y090"
-fludd_offset = Vector2i(1, 1)
+fludd_animation = "default"
+fludd_offset = Vector2i(0, 6)
 metadata/_custom_type_script = "uid://cb4g1yl24gj7m"
 
 [sub_resource type="AtlasTexture" id="AtlasTexture_f3xbj"]
@@ -1774,15 +1773,15 @@ frame_fludd = Dictionary[int, String]({
 0: "default"
 })
 frame_fludd_offsets = Dictionary[int, Vector2i]({
-0: Vector2i(0, 5),
-1: Vector2i(0, 6)
+0: Vector2i(0, 6),
+1: Vector2i(0, 7)
 })
 animation = "butt_slide_jump"
 frame = 0
 preview = false
 frame_offset = Vector2i(0, 3)
 fludd_animation = "default"
-fludd_offset = Vector2i(0, 5)
+fludd_offset = Vector2i(0, 6)
 metadata/_custom_type_script = "uid://cb4g1yl24gj7m"
 
 [sub_resource type="Resource" id="Resource_jo8kb"]
@@ -2306,6 +2305,76 @@ overwrite_other = false
 cutoff_sfx = false
 metadata/_custom_type_script = "uid://dvlt5sb8enmu8"
 
+[sub_resource type="Resource" id="Resource_msjg8"]
+resource_local_to_scene = true
+script = ExtResource("23_bbld7")
+doll_path = NodePath("Doll")
+fludd_f_path = NodePath("FluddInfront")
+fludd_b_path = NodePath("FluddBehind")
+frame_offsets = Dictionary[int, Vector2i]({
+0: Vector2i(0, 0)
+})
+frame_fludd_offsets = Dictionary[int, Vector2i]({
+0: Vector2i(0, 6),
+1: Vector2i(0, 7)
+})
+animation = "butt_slide"
+frame = 0
+preview = false
+frame_offset = Vector2i(0, 0)
+fludd_animation = "default"
+fludd_offset = Vector2i(0, 6)
+metadata/_custom_type_script = "uid://cb4g1yl24gj7m"
+
+[sub_resource type="Resource" id="Resource_rev7q"]
+resource_local_to_scene = true
+script = ExtResource("23_bbld7")
+doll_path = NodePath("Doll")
+fludd_f_path = NodePath("FluddInfront")
+fludd_b_path = NodePath("FluddBehind")
+frame_offsets = Dictionary[int, Vector2i]({
+0: Vector2i(0, 0)
+})
+frame_fludd = Dictionary[int, String]({
+0: "default"
+})
+frame_fludd_offsets = Dictionary[int, Vector2i]({
+0: Vector2i(0, 6),
+1: Vector2i(0, 7)
+})
+animation = "butt_slide_backwards"
+frame = 0
+preview = false
+frame_offset = Vector2i(0, 0)
+fludd_animation = "default"
+fludd_offset = Vector2i(0, 6)
+metadata/_custom_type_script = "uid://cb4g1yl24gj7m"
+
+[sub_resource type="Resource" id="Resource_ddfva"]
+resource_local_to_scene = true
+script = ExtResource("23_bbld7")
+doll_path = NodePath("Doll")
+fludd_f_path = NodePath("FluddInfront")
+fludd_b_path = NodePath("FluddBehind")
+frame_offsets = Dictionary[int, Vector2i]({
+0: Vector2i(0, 3),
+1: Vector2i(0, 3)
+})
+frame_fludd = Dictionary[int, String]({
+0: "default"
+})
+frame_fludd_offsets = Dictionary[int, Vector2i]({
+0: Vector2i(0, 6),
+1: Vector2i(0, 7)
+})
+animation = "butt_slide_jump"
+frame = 0
+preview = false
+frame_offset = Vector2i(0, 3)
+fludd_animation = "default"
+fludd_offset = Vector2i(0, 6)
+metadata/_custom_type_script = "uid://cb4g1yl24gj7m"
+
 [sub_resource type="Resource" id="Resource_ifrah"]
 resource_local_to_scene = true
 script = ExtResource("23_bbld7")
@@ -2403,6 +2472,31 @@ fludd_animation = "default"
 fludd_offset = Vector2i(0, 0)
 metadata/_custom_type_script = "uid://cb4g1yl24gj7m"
 
+[sub_resource type="Resource" id="Resource_nxfaa"]
+resource_local_to_scene = true
+script = ExtResource("23_bbld7")
+doll_path = NodePath("Doll")
+fludd_f_path = NodePath("FluddInfront")
+fludd_b_path = NodePath("FluddBehind")
+frame_offsets = Dictionary[int, Vector2i]({
+0: Vector2i(0, 0)
+})
+frame_fludd = Dictionary[int, String]({
+0: "rot_y090",
+1: "rot_y090"
+})
+frame_fludd_offsets = Dictionary[int, Vector2i]({
+0: Vector2i(1, 1),
+1: Vector2i(1, 2)
+})
+animation = "die"
+frame = 0
+preview = false
+frame_offset = Vector2i(0, 0)
+fludd_animation = "rot_y090"
+fludd_offset = Vector2i(1, 1)
+metadata/_custom_type_script = "uid://cb4g1yl24gj7m"
+
 [sub_resource type="Resource" id="Resource_cux1t"]
 script = ExtResource("49_apkmk")
 sfx_list = [ExtResource("152_2h0ab")]
@@ -2448,19 +2542,17 @@ offset_bottom = -33.0
 visible = false
 position = Vector2(0, -24)
 sprite_frames = SubResource("SpriteFrames_e1ut2")
-animation = &"rot_y090"
 
 [node name="Doll" type="AnimatedSprite2D" parent="." unique_id=1876045562]
 position = Vector2(0, -24)
 sprite_frames = ExtResource("4_xenv0")
-animation = &"die"
-metadata/last_previewed = SubResource("Resource_nxfaa")
+animation = &"butt_slide_forwards"
+metadata/last_previewed = SubResource("Resource_kuq6s")
 
 [node name="FluddInfront" type="AnimatedSprite2D" parent="." unique_id=1928286412]
 visible = false
 position = Vector2(0, -24)
 sprite_frames = SubResource("SpriteFrames_1i10v")
-animation = &"rot_y090"
 
 [node name="Hitbox" type="CollisionShape2D" parent="." unique_id=76578262]
 position = Vector2(0, -15)
@@ -2604,7 +2696,6 @@ max_speed = 180.0
 term_vel = 480.0
 min_grav = 774.0
 max_grav = 792.0
-snap_length = 8.0
 swim_speed = 180.0
 min_slide_incline = 0.4
 
@@ -2981,18 +3072,17 @@ sfx_layers = Array[ExtResource("49_apkmk")]([SubResource("Resource_ujdp5"), SubR
 
 [node name="ButtSlide" type="Node" parent="StateManager/Dry" unique_id=720337721]
 script = ExtResource("140_lfmwr")
-speed = 750.0
-min_speed = 300.0
-max_speed = 1200.0
+friction_coefficient_default = 0.3
+friction_coefficient_overspeed = 1.4
+accel_gravity_multiplier = 1.5
+max_speed_decel = 150.0
+max_speed = 300.0
+max_speed_accel = 500.0
 min_remain_speed = 6.0
-friction = 7.5
-max_accel = 13.2
-turn_forgiveness = 1.5
-shallow_penalty = 0.25
-incline_friction = 90.0
-animation_forward = &"butt_slide_forwards"
-animation_backward = &"butt_slide_backwards"
-animation_airborne = &"butt_slide_jump"
+default_animation_data = SubResource("Resource_msjg8")
+forward_animation_data = SubResource("Resource_kuq6s")
+backward_animation_data = SubResource("Resource_rev7q")
+airborne_animation_data = SubResource("Resource_ddfva")
 hitbox_type = "Small"
 animation_data = SubResource("Resource_ifrah")
 particles = Array[ExtResource("55_bxnxc")]([SubResource("Resource_d3rr6")])

entities/player/shared/player_movement.gd

@@ -48,8 +48,6 @@ var return_timer: float
 ## Amount of units the player needs to be above the ground to perform an airborne action.
 @export var air_margin: int = 10
 
-## Sets the floor_snap_length of the actor.
-@export var snap_length: float = 16
 
 ## The y position of the point you walljumped from.
 ## Used to avoid being able to scale a wall infinitely.

entities/player/shared/states/dry/airborne/airborne.gd

@@ -4,8 +4,6 @@ extends PlayerState
 
 
 func _physics_tick(_delta: float):
-	actor.set_floor_snap_length(0.0)
-
 	actor.stomp_hurtbox.monitoring = actor.velocity.y > 0
 
 	if actor.is_on_ceiling() and actor.velocity.y < 0 and not live_substate is GroundPound: