Spinning chairs

This commit is contained in:
Marco 2025-03-10 15:49:28 +01:00
commit 72ce9fb932
16 changed files with 290 additions and 24 deletions

View file

@ -1,4 +1,4 @@
[gd_scene load_steps=52 format=4 uid="uid://dqyfnby0t7gu1"]
[gd_scene load_steps=54 format=4 uid="uid://dqyfnby0t7gu1"]
[ext_resource type="Script" uid="uid://doxmbokehw8ci" path="res://Scripts/GameManager.cs" id="1_c3v4x"]
[ext_resource type="Resource" uid="uid://cs3ihltcn2166" path="res://Resources/Items/IcicleGun.tres" id="3_6314l"]
@ -40,7 +40,9 @@
[ext_resource type="PackedScene" uid="uid://dyvrwksve4ulg" path="res://Scenes/Items/Yin_Yang_Gun_Pickup.tscn" id="30_bea3m"]
[ext_resource type="PackedScene" uid="uid://sjxkj5jdndxb" path="res://Scenes/Items/Yin_Yang_Ammo.tscn" id="31_3a4iu"]
[ext_resource type="PackedScene" uid="uid://cnhgvn2salyxl" path="res://Scenes/Items/Icicle_Repeater.tscn" id="32_luw81"]
[ext_resource type="PackedScene" uid="uid://bjb1xv0ny1qim" path="res://Scenes/Props/Chair.tscn" id="33_7ft0s"]
[ext_resource type="Script" uid="uid://bgertv72tq1dt" path="res://Scripts/Components/FSM/NewPlayerStateMachine.cs" id="34_2vu2h"]
[ext_resource type="Script" uid="uid://b5fesrd4lv8t1" path="res://Scripts/Resources/Events/EventResource.cs" id="35_16ubp"]
[ext_resource type="Script" uid="uid://btwuahxvreivs" path="res://Scripts/Components/FSM/Player/NewInit.cs" id="35_mpb62"]
[ext_resource type="Script" uid="uid://dl50bcl8dx3k8" path="res://Scripts/Components/FSM/TestModule.cs" id="36_4rfvg"]
@ -252,9 +254,12 @@ position = Vector2(382, 170)
[node name="IcicleRepeater" parent="Tilemaps/Actors" instance=ExtResource("32_luw81")]
position = Vector2(354, 172)
[node name="Chair" parent="Tilemaps/Actors" instance=ExtResource("33_7ft0s")]
position = Vector2(260, 194)
[node name="ScriptableAreaTrigger" parent="Tilemaps" instance=ExtResource("28_fuxq3")]
position = Vector2(230, 250)
Events = Array[Object]([SubResource("Resource_pgobb")])
Events = Array[ExtResource("35_16ubp")]([SubResource("Resource_pgobb")])
[node name="CameraController" type="Camera2D" parent="."]
process_mode = 1

File diff suppressed because one or more lines are too long

117
Scenes/Props/Chair.tscn Normal file
View file

@ -0,0 +1,117 @@
[gd_scene load_steps=14 format=3 uid="uid://bjb1xv0ny1qim"]
[ext_resource type="Texture2D" uid="uid://c8rj2wjj7ho3j" path="res://Sprites/Props/Chair.png" id="1_a0rvv"]
[ext_resource type="Script" uid="uid://0hfmpf6i0icv" path="res://Scripts/Actors/Chair.cs" id="1_yxrrg"]
[sub_resource type="AtlasTexture" id="AtlasTexture_yxrrg"]
atlas = ExtResource("1_a0rvv")
region = Rect2(32, 0, 16, 16)
[sub_resource type="AtlasTexture" id="AtlasTexture_eq5fp"]
atlas = ExtResource("1_a0rvv")
region = Rect2(16, 0, 16, 16)
[sub_resource type="AtlasTexture" id="AtlasTexture_vlpit"]
atlas = ExtResource("1_a0rvv")
region = Rect2(0, 0, 16, 16)
[sub_resource type="AtlasTexture" id="AtlasTexture_hgjbl"]
atlas = ExtResource("1_a0rvv")
region = Rect2(0, 0, 16, 16)
[sub_resource type="AtlasTexture" id="AtlasTexture_3qtkp"]
atlas = ExtResource("1_a0rvv")
region = Rect2(32, 0, 16, 16)
[sub_resource type="AtlasTexture" id="AtlasTexture_ge7ok"]
atlas = ExtResource("1_a0rvv")
region = Rect2(16, 0, 16, 16)
[sub_resource type="AtlasTexture" id="AtlasTexture_t37n8"]
atlas = ExtResource("1_a0rvv")
region = Rect2(48, 0, 16, 16)
[sub_resource type="AtlasTexture" id="AtlasTexture_fu0sf"]
atlas = ExtResource("1_a0rvv")
region = Rect2(48, 0, 16, 16)
[sub_resource type="SpriteFrames" id="SpriteFrames_hgjbl"]
animations = [{
"frames": [{
"duration": 1.0,
"texture": SubResource("AtlasTexture_yxrrg")
}],
"loop": true,
"name": &"Down",
"speed": 5.0
}, {
"frames": [{
"duration": 1.0,
"texture": SubResource("AtlasTexture_eq5fp")
}],
"loop": true,
"name": &"Left",
"speed": 5.0
}, {
"frames": [{
"duration": 1.0,
"texture": SubResource("AtlasTexture_vlpit")
}],
"loop": true,
"name": &"Right",
"speed": 5.0
}, {
"frames": [{
"duration": 1.0,
"texture": SubResource("AtlasTexture_hgjbl")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_3qtkp")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_ge7ok")
}, {
"duration": 1.0,
"texture": SubResource("AtlasTexture_t37n8")
}],
"loop": true,
"name": &"Spin",
"speed": 5.0
}, {
"frames": [{
"duration": 1.0,
"texture": SubResource("AtlasTexture_fu0sf")
}],
"loop": true,
"name": &"Up",
"speed": 5.0
}]
[sub_resource type="RectangleShape2D" id="RectangleShape2D_a0rvv"]
size = Vector2(7, 10)
[sub_resource type="CircleShape2D" id="CircleShape2D_yxrrg"]
radius = 5.09902
[node name="Chair" type="StaticBody2D"]
collision_layer = 68
collision_mask = 0
script = ExtResource("1_yxrrg")
SpinTime = 1.0
[node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="."]
sprite_frames = SubResource("SpriteFrames_hgjbl")
animation = &"Down"
[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
position = Vector2(0.5, -1)
shape = SubResource("RectangleShape2D_a0rvv")
[node name="Area2D" type="Area2D" parent="."]
collision_layer = 64
collision_mask = 8
[node name="CollisionShape2D" type="CollisionShape2D" parent="Area2D"]
shape = SubResource("CircleShape2D_yxrrg")
[connection signal="area_entered" from="Area2D" to="." method="OnBulletCollision"]

View file

@ -125,7 +125,7 @@ WaitForCompletion = true
[sub_resource type="Resource" id="Resource_b25hy"]
script = ExtResource("46_i0omr")
TimelineName = "testintro"
TimelineName = &"timeline"
WaitForCompletion = true
[sub_resource type="CircleShape2D" id="CircleShape2D_8wuck"]
@ -133,14 +133,14 @@ WaitForCompletion = true
[sub_resource type="Resource" id="Resource_ji7au"]
resource_local_to_scene = true
script = ExtResource("46_i0omr")
TimelineName = "computer2"
TimelineName = &"timeline"
WaitForCompletion = true
metadata/_custom_type_script = "uid://ddv26x2qilprb"
[sub_resource type="Resource" id="Resource_fasrq"]
resource_local_to_scene = true
script = ExtResource("46_i0omr")
TimelineName = "computer_control_1"
TimelineName = &"timeline"
WaitForCompletion = true
metadata/_custom_type_script = "uid://ddv26x2qilprb"
@ -157,12 +157,12 @@ WaitForCompletion = true
[sub_resource type="Resource" id="Resource_s3g2w"]
script = ExtResource("46_i0omr")
TimelineName = "Mission1_Briefing"
TimelineName = &"timeline"
WaitForCompletion = true
[sub_resource type="Resource" id="Resource_068l7"]
script = ExtResource("46_i0omr")
TimelineName = "rumia_defeat"
TimelineName = &"timeline"
WaitForCompletion = true
[sub_resource type="Resource" id="Resource_l3nop"]
@ -189,7 +189,7 @@ WaitForCompletion = true
[sub_resource type="Resource" id="Resource_b1dht"]
script = ExtResource("46_i0omr")
TimelineName = "Rumia_Intro"
TimelineName = &"timeline"
WaitForCompletion = true
[sub_resource type="Resource" id="Resource_xrgpy"]