Even more changes.

This commit is contained in:
2025-06-24 12:17:20 -06:00
parent 1bbd8c812f
commit 827f333e72
301 changed files with 2454 additions and 743 deletions
Executable → Regular
+138 -72
View File
@@ -1,38 +1,9 @@
[gd_scene load_steps=88 format=3 uid="uid://2f3x4fcr0os6"]
[gd_scene load_steps=93 format=3 uid="uid://2f3x4fcr0os6"]
[ext_resource type="Texture2D" uid="uid://ci24lybfsaxd0" path="res://objects/player.png" id="1_2mhpo"]
[ext_resource type="Script" uid="uid://drpdjfp0o7bbv" path="res://objects/player.gd" id="1_c7kgv"]
[ext_resource type="Script" uid="uid://e6q7q0ljb34u" path="res://scripts/state_collision.gd" id="1_uxov2"]
[ext_resource type="Script" uid="uid://cgeaq15vi0bnd" path="res://objects/player_sprite.gd" id="3_uxov2"]
[sub_resource type="AtlasTexture" id="AtlasTexture_ykyjo"]
atlas = ExtResource("1_2mhpo")
region = Rect2(0, 602, 35, 43)
[sub_resource type="AtlasTexture" id="AtlasTexture_uxov2"]
atlas = ExtResource("1_2mhpo")
region = Rect2(35, 602, 35, 43)
[sub_resource type="AtlasTexture" id="AtlasTexture_nmc1l"]
atlas = ExtResource("1_2mhpo")
region = Rect2(70, 602, 35, 43)
[sub_resource type="AtlasTexture" id="AtlasTexture_f46kd"]
atlas = ExtResource("1_2mhpo")
region = Rect2(105, 602, 35, 43)
[sub_resource type="AtlasTexture" id="AtlasTexture_3rerk"]
atlas = ExtResource("1_2mhpo")
region = Rect2(140, 602, 35, 43)
[sub_resource type="AtlasTexture" id="AtlasTexture_i825w"]
atlas = ExtResource("1_2mhpo")
region = Rect2(175, 602, 35, 43)
[sub_resource type="AtlasTexture" id="AtlasTexture_3rfka"]
atlas = ExtResource("1_2mhpo")
region = Rect2(210, 602, 35, 43)
[sub_resource type="AtlasTexture" id="AtlasTexture_i8sra"]
atlas = ExtResource("1_2mhpo")
region = Rect2(0, 344, 35, 43)
@@ -121,6 +92,34 @@ region = Rect2(0, 215, 35, 43)
atlas = ExtResource("1_2mhpo")
region = Rect2(0, 172, 35, 43)
[sub_resource type="AtlasTexture" id="AtlasTexture_nmc1l"]
atlas = ExtResource("1_2mhpo")
region = Rect2(0, 645, 35, 43)
[sub_resource type="AtlasTexture" id="AtlasTexture_f46kd"]
atlas = ExtResource("1_2mhpo")
region = Rect2(35, 645, 35, 43)
[sub_resource type="AtlasTexture" id="AtlasTexture_3rerk"]
atlas = ExtResource("1_2mhpo")
region = Rect2(70, 645, 35, 43)
[sub_resource type="AtlasTexture" id="AtlasTexture_i825w"]
atlas = ExtResource("1_2mhpo")
region = Rect2(105, 645, 35, 43)
[sub_resource type="AtlasTexture" id="AtlasTexture_3rfka"]
atlas = ExtResource("1_2mhpo")
region = Rect2(140, 645, 35, 43)
[sub_resource type="AtlasTexture" id="AtlasTexture_egsjp"]
atlas = ExtResource("1_2mhpo")
region = Rect2(175, 645, 35, 43)
[sub_resource type="AtlasTexture" id="AtlasTexture_vvqst"]
atlas = ExtResource("1_2mhpo")
region = Rect2(210, 645, 35, 43)
[sub_resource type="AtlasTexture" id="AtlasTexture_6ypbn"]
atlas = ExtResource("1_2mhpo")
region = Rect2(0, 387, 35, 43)
@@ -197,6 +196,10 @@ region = Rect2(175, 559, 35, 43)
atlas = ExtResource("1_2mhpo")
region = Rect2(210, 559, 35, 43)
[sub_resource type="AtlasTexture" id="AtlasTexture_8te8c"]
atlas = ExtResource("1_2mhpo")
region = Rect2(0, 602, 35, 43)
[sub_resource type="AtlasTexture" id="AtlasTexture_r7a5p"]
atlas = ExtResource("1_2mhpo")
region = Rect2(0, 129, 35, 43)
@@ -293,6 +296,30 @@ region = Rect2(140, 43, 35, 43)
atlas = ExtResource("1_2mhpo")
region = Rect2(175, 43, 35, 43)
[sub_resource type="AtlasTexture" id="AtlasTexture_le5ai"]
atlas = ExtResource("1_2mhpo")
region = Rect2(0, 688, 35, 43)
[sub_resource type="AtlasTexture" id="AtlasTexture_f0uyi"]
atlas = ExtResource("1_2mhpo")
region = Rect2(35, 688, 35, 43)
[sub_resource type="AtlasTexture" id="AtlasTexture_0wtkl"]
atlas = ExtResource("1_2mhpo")
region = Rect2(70, 688, 35, 43)
[sub_resource type="AtlasTexture" id="AtlasTexture_78ip1"]
atlas = ExtResource("1_2mhpo")
region = Rect2(105, 688, 35, 43)
[sub_resource type="AtlasTexture" id="AtlasTexture_syu46"]
atlas = ExtResource("1_2mhpo")
region = Rect2(0, 731, 35, 43)
[sub_resource type="AtlasTexture" id="AtlasTexture_urgsq"]
atlas = ExtResource("1_2mhpo")
region = Rect2(35, 731, 35, 43)
[sub_resource type="AtlasTexture" id="AtlasTexture_p2pxn"]
atlas = ExtResource("1_2mhpo")
region = Rect2(0, 516, 35, 43)
@@ -325,32 +352,6 @@ region = Rect2(210, 516, 35, 43)
animations = [{
"frames": [{
"duration": 1.0,
"texture": SubResource("AtlasTexture_ykyjo")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_uxov2")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_nmc1l")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_f46kd")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_3rerk")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_i825w")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_3rfka")
}],
"loop": false,
"name": &"air_kick",
"speed": 24.0
}, {
"frames": [{
"duration": 1.0,
"texture": SubResource("AtlasTexture_i8sra")
}, {
"duration": 1.0,
@@ -447,6 +448,32 @@ animations = [{
}, {
"frames": [{
"duration": 1.0,
"texture": SubResource("AtlasTexture_nmc1l")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_f46kd")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_3rerk")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_i825w")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_3rfka")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_egsjp")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_vvqst")
}],
"loop": false,
"name": &"kick",
"speed": 24.0
}, {
"frames": [{
"duration": 1.0,
"texture": SubResource("AtlasTexture_6ypbn")
}, {
"duration": 1.0,
@@ -517,6 +544,18 @@ animations = [{
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_4g3oa")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_4g3oa")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_4g3oa")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_4g3oa")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_4g3oa")
}],
"loop": false,
"name": &"pound",
@@ -524,6 +563,14 @@ animations = [{
}, {
"frames": [{
"duration": 1.0,
"texture": SubResource("AtlasTexture_8te8c")
}],
"loop": false,
"name": &"pound_fall",
"speed": 18.0
}, {
"frames": [{
"duration": 1.0,
"texture": SubResource("AtlasTexture_r7a5p")
}, {
"duration": 1.0,
@@ -611,6 +658,34 @@ animations = [{
}, {
"frames": [{
"duration": 1.0,
"texture": SubResource("AtlasTexture_le5ai")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_f0uyi")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_0wtkl")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_78ip1")
}],
"loop": true,
"name": &"shoot",
"speed": 30.0
}, {
"frames": [{
"duration": 1.0,
"texture": SubResource("AtlasTexture_syu46")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_urgsq")
}],
"loop": true,
"name": &"shoot_shuffle",
"speed": 6.0
}, {
"frames": [{
"duration": 1.0,
"texture": SubResource("AtlasTexture_p2pxn")
}, {
"duration": 1.0,
@@ -636,9 +711,9 @@ animations = [{
"speed": 24.0
}]
[sub_resource type="CapsuleShape2D" id="CapsuleShape2D_f46kd"]
radius = 8.0
height = 16.0
[sub_resource type="CapsuleShape2D" id="CapsuleShape2D_nmc1l"]
radius = 6.0
height = 22.0
[sub_resource type="GDScript" id="GDScript_uxov2"]
script/source = "extends CollisionState2D
@@ -647,10 +722,6 @@ func _on_player_state_change(_old: Player.States, new: Player.States) -> void:
change_shape(Player.States.keys()[new])
"
[sub_resource type="CapsuleShape2D" id="CapsuleShape2D_nmc1l"]
radius = 6.0
height = 22.0
[node name="Player" type="CharacterBody2D"]
z_index = 10
floor_constant_speed = true
@@ -663,14 +734,13 @@ max_polyphony = 2
[node name="Sprite" type="AnimatedSprite2D" parent="."]
position = Vector2(0, -11)
sprite_frames = SubResource("SpriteFrames_blchw")
animation = &"roll"
frame = 4
animation = &"pound"
offset = Vector2(0, -0.5)
script = ExtResource("3_uxov2")
[node name="Hitbox" type="CollisionShape2D" parent="."]
position = Vector2(0, -11)
shape = SubResource("CapsuleShape2D_f46kd")
shape = SubResource("CapsuleShape2D_nmc1l")
script = SubResource("GDScript_uxov2")
Shapes = Dictionary[String, Shape2D]({
"IDLE": SubResource("CapsuleShape2D_nmc1l")
@@ -683,11 +753,7 @@ offset_top = -56.0
offset_right = 40.0
offset_bottom = -24.0
[node name="Attackbox" type="Area2D" parent="."]
[node name="CollisionState2D" type="CollisionShape2D" parent="Attackbox"]
script = ExtResource("1_uxov2")
metadata/_custom_type_script = "uid://e6q7q0ljb34u"
[connection signal="state_change" from="." to="Sprite" method="_on_player_state_change"]
[connection signal="state_change" from="." to="Hitbox" method="_on_player_state_change"]
[connection signal="animation_finished" from="Sprite" to="Sprite" method="_on_animation_finished"]
[connection signal="frame_changed" from="Sprite" to="Sprite" method="_on_frame_changed"]