Merge branch 'main' into main

Reviewed-on: http://julianloza.synology.me:3000/Julian/JuegoClase/pulls/2

.gitignore

@@ -1,4 +1,3 @@
 # Godot 4+ specific ignores
 .godot/
 /android/
-.pa

Maps/main_menu.tscn

@@ -33,20 +33,15 @@ offset_right = 268.0
 offset_bottom = 228.0
 
 [node name="Button" type="Button" parent="VBoxContainer"]
-offset_right = 110.0
+layout_mode = 2
-offset_bottom = 31.0
 text = "START"
 
 [node name="Button2" type="Button" parent="VBoxContainer"]
-offset_top = 35.0
+layout_mode = 2
-offset_right = 110.0
-offset_bottom = 66.0
 text = "EXIT"
 
 [node name="Button3" type="Button" parent="VBoxContainer"]
-offset_top = 70.0
+layout_mode = 2
-offset_right = 110.0
-offset_bottom = 101.0
 text = "FULL SCREEN
 "
 
@@ -95,7 +90,6 @@ texture = ExtResource("7_ubh51")
 
 [node name="Camera2D" type="Camera2D" parent="."]
 position = Vector2(214, 117)
-current = true
 
 [connection signal="pressed" from="VBoxContainer/Button" to="." method="_on_button_pressed"]
 [connection signal="pressed" from="VBoxContainer/Button2" to="." method="_on_button_2_pressed"]

Maps/world_2.tscn

@@ -19,42 +19,30 @@
 texture = ExtResource("1_hkahx")
 0:10/0 = 0
 0:10/0/terrain_set = 0
-0:10/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-0:10/0/physics_layer_0/angular_velocity = 0.0
 0:10/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 0:10/0/terrains_peering_bit/top_right_corner = 0
 0:9/0 = 0
 0:9/0/terrain_set = 0
-0:9/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-0:9/0/physics_layer_0/angular_velocity = 0.0
 0:9/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 0:9/0/terrains_peering_bit/right_side = 0
 0:9/0/terrains_peering_bit/bottom_right_corner = 0
 0:9/0/terrains_peering_bit/top_right_corner = 0
 0:8/0 = 0
 0:8/0/terrain_set = 0
-0:8/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-0:8/0/physics_layer_0/angular_velocity = 0.0
 0:8/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 0:8/0/terrains_peering_bit/bottom_right_corner = 0
 1:8/0 = 0
 1:8/0/terrain_set = 0
-1:8/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-1:8/0/physics_layer_0/angular_velocity = 0.0
 1:8/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 1:8/0/terrains_peering_bit/bottom_right_corner = 0
 1:8/0/terrains_peering_bit/bottom_side = 0
 1:8/0/terrains_peering_bit/bottom_left_corner = 0
 2:8/0 = 0
 2:8/0/terrain_set = 0
-2:8/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-2:8/0/physics_layer_0/angular_velocity = 0.0
 2:8/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 2:8/0/terrains_peering_bit/bottom_left_corner = 0
 3:8/0 = 0
 3:8/0/terrain_set = 0
-3:8/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-3:8/0/physics_layer_0/angular_velocity = 0.0
 3:8/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 3:8/0/terrains_peering_bit/bottom_left_corner = 0
 3:8/0/terrains_peering_bit/left_side = 0
@@ -63,8 +51,6 @@ texture = ExtResource("1_hkahx")
 3:8/0/terrains_peering_bit/top_right_corner = 0
 4:8/0 = 0
 4:8/0/terrain_set = 0
-4:8/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-4:8/0/physics_layer_0/angular_velocity = 0.0
 4:8/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 4:8/0/terrains_peering_bit/right_side = 0
 4:8/0/terrains_peering_bit/bottom_right_corner = 0
@@ -73,8 +59,6 @@ texture = ExtResource("1_hkahx")
 4:8/0/terrains_peering_bit/top_right_corner = 0
 4:9/0 = 0
 4:9/0/terrain_set = 0
-4:9/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-4:9/0/physics_layer_0/angular_velocity = 0.0
 4:9/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 4:9/0/terrains_peering_bit/right_side = 0
 4:9/0/terrains_peering_bit/bottom_right_corner = 0
@@ -82,21 +66,13 @@ texture = ExtResource("1_hkahx")
 4:9/0/terrains_peering_bit/bottom_left_corner = 0
 4:9/0/terrains_peering_bit/top_right_corner = 0
 4:10/0 = 0
-4:10/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-4:10/0/physics_layer_0/angular_velocity = 0.0
 3:10/0 = 0
-3:10/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-3:10/0/physics_layer_0/angular_velocity = 0.0
 2:10/0 = 0
 2:10/0/terrain_set = 0
-2:10/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-2:10/0/physics_layer_0/angular_velocity = 0.0
 2:10/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 2:10/0/terrains_peering_bit/top_left_corner = 0
 1:10/0 = 0
 1:10/0/terrain_set = 0
-1:10/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-1:10/0/physics_layer_0/angular_velocity = 0.0
 1:10/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 1:10/0/terrains_peering_bit/top_left_corner = 0
 1:10/0/terrains_peering_bit/top_side = 0
@@ -104,8 +80,6 @@ texture = ExtResource("1_hkahx")
 1:9/0 = 0
 1:9/0/terrain_set = 0
 1:9/0/terrain = 0
-1:9/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-1:9/0/physics_layer_0/angular_velocity = 0.0
 1:9/0/terrains_peering_bit/right_side = 0
 1:9/0/terrains_peering_bit/bottom_right_corner = 0
 1:9/0/terrains_peering_bit/bottom_side = 0
@@ -116,16 +90,12 @@ texture = ExtResource("1_hkahx")
 1:9/0/terrains_peering_bit/top_right_corner = 0
 2:9/0 = 0
 2:9/0/terrain_set = 0
-2:9/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-2:9/0/physics_layer_0/angular_velocity = 0.0
 2:9/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 2:9/0/terrains_peering_bit/bottom_left_corner = 0
 2:9/0/terrains_peering_bit/left_side = 0
 2:9/0/terrains_peering_bit/top_left_corner = 0
 3:9/0 = 0
 3:9/0/terrain_set = 0
-3:9/0/physics_layer_0/linear_velocity = Vector2(0, 0)
-3:9/0/physics_layer_0/angular_velocity = 0.0
 3:9/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
 3:9/0/terrains_peering_bit/bottom_right_corner = 0
 3:9/0/terrains_peering_bit/bottom_side = 0
@@ -229,9 +199,9 @@ curve = SubResource("Curve2D_xbbc4")
 platformSpeed = 0.284
 
 [node name="PathFollow2D" parent="Platform" index="0"]
-position = Vector2(230.957, -12.1214)
+position = Vector2(29.1281, -6.18427)
-rotation = -0.0282943
+rotation = -0.0658388
-progress = 235.163
+progress = 33.2031
 
 [node name="FallDamage" parent="." instance=ExtResource("10_1wkwm")]
 position = Vector2(85, 259)
@@ -249,12 +219,12 @@ platformSpeed = 0.888
 curve = SubResource("Curve2D_2qvbj")
 
 [node name="PathFollow2D" parent="Sierra2/Path2D" index="0"]
-position = Vector2(2.12025, -27.5509)
+position = Vector2(2.00764, -32.5866)
-rotation = -1.59782
+rotation = -1.5779
-progress = 32.5748
+progress = 37.7707
 
 [node name="Sprite" parent="Sierra2/Path2D/PathFollow2D/SierraVerdadera" index="0"]
-rotation = 1857.37
+rotation = 2132.02
 
 [node name="Chain" type="Sprite2D" parent="Sierra2"]
 position = Vector2(3, 1)

Personajes/EnemigoCerdito/enemigo_cerdito.gd

@@ -1,5 +1,5 @@
 extends Personajes
-
+# comentario
 
 		
 

Player/player.tscn

@@ -199,12 +199,14 @@ collision_mask = 6
 script = ExtResource("1_7wx7r")
 
 [node name="LabelState" type="Label" parent="."]
+visible = false
 z_index = 10
 offset_left = -9.0
 offset_top = -28.0
 offset_right = 38.0
 offset_bottom = -2.0
-text = "aaaaa"
+text = "as
+"
 label_settings = SubResource("LabelSettings_82qkg")
 
 [node name="StateMachine" type="Node" parent="."]
@@ -337,7 +339,7 @@ stream = ExtResource("7_jbpay")
 collision_mask = 6
 
 [node name="CollisionShape2D" type="CollisionShape2D" parent="RecibirDanio"]
-position = Vector2(1, 4.5)
+position = Vector2(1, 4)
 shape = SubResource("RectangleShape2D_menop")
 
 [connection signal="timeout" from="StateMachine/Dash/DashTimer" to="StateMachine/Dash" method="_on_dash_timer_timeout"]