Conveyor belts

Scenes/Actors/fsm_player.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=58 format=3 uid="uid://c4pr2707hbeph"]
+[gd_scene load_steps=60 format=3 uid="uid://c4pr2707hbeph"]
 
 [ext_resource type="Script" uid="uid://d2ubk5gucny6s" path="res://Scripts/Components/FSM/PlayerFSMProxy.cs" id="1_g3wua"]
 [ext_resource type="Script" uid="uid://bw2hakslndaxm" path="res://Scripts/Components/FSM/PlayerStateMachine.cs" id="1_mpmil"]
@@ -31,6 +31,7 @@
 [ext_resource type="Script" uid="uid://cem7a1agaqtrt" path="res://Scenes/InteractionController.cs" id="27_vwjki"]
 [ext_resource type="Script" uid="uid://d0bebi2vn171l" path="res://Scripts/Components/FSM/Player/PlayerFSMItemUseModule.cs" id="29_m323t"]
 [ext_resource type="Texture2D" uid="uid://ddwhrlrgj6i00" path="res://Sprites/Actors/Cirno.png" id="30_li0ug"]
+[ext_resource type="Script" uid="uid://camgjo4302qmq" path="res://Scripts/Components/Actors/ConveyorBeltMover.cs" id="32_4f2wn"]
 
 [sub_resource type="CircleShape2D" id="CircleShape2D_b3hxm"]
 radius = 5.0
@@ -224,10 +225,14 @@ _data = {
 &"Walk_Up": SubResource("Animation_v2m0j")
 }
 
+[sub_resource type="CircleShape2D" id="CircleShape2D_fnw0c"]
+radius = 2.05679
+
 [node name="FSMPlayer" type="CharacterBody2D" node_paths=PackedStringArray("PlayerFSM", "InteractionController")]
 process_mode = 1
 collision_layer = 2
 collision_mask = 97
+platform_floor_layers = 4294967294
 platform_wall_layers = 97
 script = ExtResource("1_g3wua")
 PlayerFSM = NodePath("StateMachine")
@@ -251,7 +256,7 @@ _inputProvider = NodePath("../../InputProvider")
 _damageReceiver = NodePath("../../DamageReceiver")
 _activationProvider = NodePath("../../InteractionProvider")
 _interactionController = NodePath("../../InteractionController")
-_moduleNodes = [NodePath("../../InteractionController"), NodePath("../../ItemUser")]
+_moduleNodes = [NodePath("../../InteractionController"), NodePath("../../ItemUser"), NodePath("../../ConveyorBeltMover")]
 
 [node name="Cutscene" type="Node2D" parent="StateMachine" node_paths=PackedStringArray("_animationProvider")]
 script = ExtResource("4_22ff8")
@@ -285,10 +290,8 @@ shape = SubResource("CircleShape2D_b3hxm")
 [node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="."]
 material = ExtResource("4_5qlss")
 sprite_frames = ExtResource("4_s0ir4")
-animation = &"Drowning"
+animation = &"idle"
 autoplay = "idle"
-frame = 15
-frame_progress = 0.860925
 
 [node name="WeaponProvider" type="Node2D" parent="."]
 script = ExtResource("5_gp3hw")
@@ -411,6 +414,17 @@ libraries = {
 &"": SubResource("AnimationLibrary_nfrn8")
 }
 
+[node name="ConveyorBeltMover" type="Area2D" parent="."]
+collision_layer = 2
+collision_mask = 512
+script = ExtResource("32_4f2wn")
+
+[node name="CollisionShape2D" type="CollisionShape2D" parent="ConveyorBeltMover"]
+position = Vector2(0, 6.48)
+shape = SubResource("CircleShape2D_fnw0c")
+
 [connection signal="area_entered" from="DamageReceiver" to="DamageReceiver" method="_on_damage_hitbox_area_entered"]
 [connection signal="area_entered" from="InteractionProvider" to="InteractionProvider" method="_on_interaction_controller_area_entered"]
 [connection signal="area_exited" from="InteractionProvider" to="InteractionProvider" method="_on_interaction_controller_area_exited"]
+[connection signal="body_entered" from="ConveyorBeltMover" to="ConveyorBeltMover" method="OnBodyEntered"]
+[connection signal="body_exited" from="ConveyorBeltMover" to="ConveyorBeltMover" method="OnBodyExited"]

Scenes/MainMenu.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=20 format=3 uid="uid://5xajclchk3my"]
+[gd_scene load_steps=22 format=3 uid="uid://5xajclchk3my"]
 
 [ext_resource type="Script" uid="uid://dql102fvubniv" path="res://Scripts/MainMenu.cs" id="1_702nk"]
 [ext_resource type="PackedScene" uid="uid://c84shrj84g4t2" path="res://Scenes/HUD/MusicRoom.tscn" id="2_if7li"]
@@ -14,10 +14,15 @@
 [ext_resource type="PackedScene" uid="uid://b3tyacxxw88lx" path="res://Scenes/Utils/StreamPlayerWithName.tscn" id="8_koqhg"]
 [ext_resource type="PackedScene" uid="uid://bmj8t4pou6608" path="res://Scenes/HUD/TitleCrystal.tscn" id="8_riqfo"]
 [ext_resource type="PackedScene" uid="uid://bemu3l6b1e84y" path="res://Scenes/HUD/debug_menu.tscn" id="9_nwlsr"]
+[ext_resource type="Texture2D" uid="uid://p242xo3qxwve" path="res://Sprites/UI/Crystal3.png" id="9_riqfo"]
 [ext_resource type="Texture2D" uid="uid://cv1fmski5dvhk" path="res://Sprites/Briefing/Intro/robot pov/l1_robot pov1.png" id="12_7467j"]
 [ext_resource type="Resource" uid="uid://byo74ews118nl" path="res://Resources/Music/No_Reason.tres" id="13_fh7cp"]
 [ext_resource type="FontFile" uid="uid://cyk27h5aox1n7" path="res://fonts/sector_034.ttf" id="14_yxkem"]
 
+[sub_resource type="AtlasTexture" id="AtlasTexture_aoyqx"]
+atlas = ExtResource("9_riqfo")
+region = Rect2(320, 0, 32, 16)
+
 [sub_resource type="Theme" id="Theme_c7h4d"]
 
 [sub_resource type="LabelSettings" id="LabelSettings_htmja"]
@@ -61,6 +66,7 @@ offset_top = 44.855
 offset_right = 192.36
 offset_bottom = 60.855
 rotation = 3.14159
+texture = SubResource("AtlasTexture_aoyqx")
 
 [node name="MarginContainer" type="MarginContainer" parent="."]
 anchors_preset = 15

Scenes/Props/Conveyor_Horizontal.tscn

@@ -0,0 +1,103 @@
+[gd_scene load_steps=11 format=3 uid="uid://bc4ffe8oscm6y"]
+
+[ext_resource type="Texture2D" uid="uid://yi2nv5x10r2e" path="res://Sprites/Props/Conveyor_Horizontal.png" id="1_hb8qr"]
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_ysm5s"]
+atlas = ExtResource("1_hb8qr")
+region = Rect2(0, 0, 16, 16)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_07rsj"]
+atlas = ExtResource("1_hb8qr")
+region = Rect2(16, 0, 16, 16)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_mnaio"]
+atlas = ExtResource("1_hb8qr")
+region = Rect2(32, 0, 16, 16)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_btv6n"]
+atlas = ExtResource("1_hb8qr")
+region = Rect2(48, 0, 16, 16)
+
+[sub_resource type="SpriteFrames" id="SpriteFrames_g7o5d"]
+animations = [{
+"frames": [{
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_ysm5s")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_07rsj")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_mnaio")
+}, {
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_btv6n")
+}],
+"loop": true,
+"name": &"default",
+"speed": 5.0
+}]
+
+[sub_resource type="Animation" id="Animation_hb8qr"]
+resource_name = "Active"
+length = 0.8
+loop_mode = 1
+tracks/0/type = "value"
+tracks/0/imported = false
+tracks/0/enabled = true
+tracks/0/path = NodePath("Sprite2D:frame")
+tracks/0/interp = 1
+tracks/0/loop_wrap = true
+tracks/0/keys = {
+"times": PackedFloat32Array(0, 0.2, 0.4, 0.6),
+"transitions": PackedFloat32Array(1, 1, 1, 1),
+"update": 1,
+"values": [0, 1, 2, 3]
+}
+
+[sub_resource type="Animation" id="Animation_ysm5s"]
+length = 0.001
+tracks/0/type = "value"
+tracks/0/imported = false
+tracks/0/enabled = true
+tracks/0/path = NodePath("Sprite2D:frame")
+tracks/0/interp = 1
+tracks/0/loop_wrap = true
+tracks/0/keys = {
+"times": PackedFloat32Array(0),
+"transitions": PackedFloat32Array(1),
+"update": 1,
+"values": [0]
+}
+
+[sub_resource type="AnimationLibrary" id="AnimationLibrary_07rsj"]
+_data = {
+&"Active": SubResource("Animation_hb8qr"),
+&"RESET": SubResource("Animation_ysm5s")
+}
+
+[sub_resource type="RectangleShape2D" id="RectangleShape2D_hb8qr"]
+size = Vector2(16, 16)
+
+[node name="ConveyorHorizontal" type="Area2D"]
+metadata/_edit_group_ = true
+
+[node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="."]
+visible = false
+sprite_frames = SubResource("SpriteFrames_g7o5d")
+autoplay = "default"
+frame = 2
+frame_progress = 0.48232
+
+[node name="Sprite2D" type="Sprite2D" parent="."]
+texture = ExtResource("1_hb8qr")
+hframes = 4
+region_rect = Rect2(0, 0, 16, 16)
+
+[node name="AnimationPlayer" type="AnimationPlayer" parent="."]
+libraries = {
+&"": SubResource("AnimationLibrary_07rsj")
+}
+
+[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
+shape = SubResource("RectangleShape2D_hb8qr")