Merge branch 'master' of gitlab.com:MaddoScientisto/cirnogodot

Scenes/Interactable/Computer.tscn

@@ -1,10 +1,49 @@
-[gd_scene load_steps=4 format=3 uid="uid://doqmmuuuprl3s"]
+[gd_scene load_steps=8 format=3 uid="uid://doqmmuuuprl3s"]
 
 [ext_resource type="Script" path="res://Scripts/Interactables/Switch.cs" id="1_62csb"]
-[ext_resource type="Texture2D" uid="uid://dyk2r7qkhdtkp" path="res://Sprites/Props/Computer.png" id="1_bo0p8"]
+[ext_resource type="Texture2D" uid="uid://dfjdl48v8kt2l" path="res://Sprites/Props/Computer2.png" id="2_tlxq6"]
 
 [sub_resource type="CircleShape2D" id="CircleShape2D_wv7xi"]
 
+[sub_resource type="AtlasTexture" id="AtlasTexture_6yfpu"]
+atlas = ExtResource("2_tlxq6")
+region = Rect2(0, 0, 16, 16)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_jl6l5"]
+atlas = ExtResource("2_tlxq6")
+region = Rect2(16, 0, 16, 16)
+
+[sub_resource type="AtlasTexture" id="AtlasTexture_jxgtm"]
+atlas = ExtResource("2_tlxq6")
+region = Rect2(32, 0, 16, 16)
+
+[sub_resource type="SpriteFrames" id="SpriteFrames_7837l"]
+animations = [{
+"frames": [{
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_6yfpu")
+}],
+"loop": true,
+"name": &"default",
+"speed": 5.0
+}, {
+"frames": [{
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_jl6l5")
+}],
+"loop": true,
+"name": &"left",
+"speed": 5.0
+}, {
+"frames": [{
+"duration": 1.0,
+"texture": SubResource("AtlasTexture_jxgtm")
+}],
+"loop": true,
+"name": &"right",
+"speed": 5.0
+}]
+
 [node name="Computer" type="Area2D" groups=["Interactable"]]
 collision_layer = 4
 collision_mask = 2
@@ -13,5 +52,5 @@ script = ExtResource("1_62csb")
 [node name="CollisionShape2D" type="CollisionShape2D" parent="."]
 shape = SubResource("CircleShape2D_wv7xi")
 
-[node name="Sprite2D" type="Sprite2D" parent="."]
-texture = ExtResource("1_bo0p8")
+[node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="."]
+sprite_frames = SubResource("SpriteFrames_7837l")

Scenes/Props/MediumTerminal.tscn

@@ -13,7 +13,7 @@ size = Vector2(28, 24)
 [sub_resource type="RectangleShape2D" id="RectangleShape2D_vguns"]
 size = Vector2(26, 22)
 
-[node name="LargeTank" type="Area2D" groups=["Destroyable"]]
+[node name="Mainframe" type="Area2D" groups=["Destroyable"]]
 collision_layer = 64
 collision_mask = 10
 script = ExtResource("1_iba8l")

Scenes/player.tscn

@@ -1,9 +1,10 @@
-[gd_scene load_steps=33 format=3 uid="uid://bghghp5ep4w2j"]
+[gd_scene load_steps=34 format=3 uid="uid://bghghp5ep4w2j"]
 
 [ext_resource type="Script" path="res://Scripts/PlayerMovement.cs" id="1_m27vu"]
 [ext_resource type="Texture2D" uid="uid://la06powu57hu" path="res://Sprites/Cirno_Big.png" id="2_bwf6x"]
 [ext_resource type="PackedScene" uid="uid://b1qnfiuokpvsr" path="res://Scenes/Weapons/bullet.tscn" id="2_ov36d"]
 [ext_resource type="PackedScene" uid="uid://chkpk7erlqajg" path="res://Scenes/Selector.tscn" id="3_8wt6s"]
+[ext_resource type="Texture2D" uid="uid://b2v6j7lsyltrc" path="res://Sprites/Actors/CirnoWings.png" id="3_ul15q"]
 [ext_resource type="Script" path="res://addons/smoothing/smoothing_2d.gd" id="4_j4xhu"]
 [ext_resource type="Texture2D" uid="uid://ddwhrlrgj6i00" path="res://Sprites/Actors/Cirno.png" id="5_hq878"]
 [ext_resource type="PackedScene" uid="uid://cfb3nsay84xdb" path="res://Scenes/Weapons/crosshair.tscn" id="6_l43rf"]
@@ -170,6 +171,7 @@ StrafeSpeed = 35
 CrosshairDistance = 35.0
 SelectorScene = ExtResource("3_8wt6s")
 GameOverScene = "res://Scenes/GameOver.tscn"
+WingsSprite = ExtResource("3_ul15q")
 Muzzle = NodePath("Muzzle")
 HitboxSprite = NodePath("Smoothing2D/HitboxSprite")
 metadata/_edit_group_ = true