maddo/cirnogodot
1
0
Fork 0
mirror of https://gitlab.com/MaddoScientisto/cirnogodot.git synced 2026-06-20 14:33:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse source
This commit is contained in:
Marco 2025-03-26 10:17:21 +01:00
commit 9e8c2220b2
24 changed files with 97 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Scenes/Actors/fsm_player.tscn
View file

@ -373,8 +373,9 @@ shape = SubResource("CircleShape2D_b3hxm")
[node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="."]
material = ExtResource("4_5qlss")
sprite_frames = ExtResource("4_s0ir4")
animation = &"idle"
animation = &"walk_up"
autoplay = "idle"
frame_progress = 0.405397
[node name="WeaponProvider" type="Node2D" parent="."]
script = ExtResource("5_gp3hw")

6
Scenes/Maps/Level2.tscn
View file

@ -1,4 +1,4 @@
[gd_scene load_steps=88 format=4 uid="uid://6a6tjohypmmb"]
[gd_scene load_steps=89 format=4 uid="uid://6a6tjohypmmb"]
[ext_resource type="Script" uid="uid://doxmbokehw8ci" path="res://Scripts/GameManager.cs" id="1_t2k72"]
[ext_resource type="PackedScene" uid="uid://c4pr2707hbeph" path="res://Scenes/Actors/fsm_player.tscn" id="2_2jsgm"]
@ -45,6 +45,7 @@
[ext_resource type="PackedScene" uid="uid://ey71mxa5ocpn" path="res://Scenes/Items/Shield_Extend_Pickup.tscn" id="37_5j8ks"]
[ext_resource type="PackedScene" uid="uid://dfat0erkvb513" path="res://Scenes/Actors/Fairy_New.tscn" id="37_sb7g3"]
[ext_resource type="PackedScene" uid="uid://1yxieu8ekvkm" path="res://Scenes/Items/Heart_Extend_Pickup.tscn" id="38_sb7g3"]
[ext_resource type="PackedScene" uid="uid://cqi87wcxymbhx" path="res://Scenes/Props/Shelf.tscn" id="40_sb7g3"]
[sub_resource type="Resource" id="Resource_6wo78"]
script = ExtResource("4_s1vkf")
@ -592,6 +593,9 @@ Target = NodePath("../Elevator3")
position = Vector2(-504, 912)
Targets = [NodePath("../Elevator2")]
[node name="Shelf" parent="Tilemaps/Actors" instance=ExtResource("40_sb7g3")]
position = Vector2(-225, 154)
[node name="ControlPad8" parent="Tilemaps/Actors" node_paths=PackedStringArray("Targets") instance=ExtResource("16_s23f3")]
position = Vector2(-500, 727)
Targets = [NodePath("../Elevator2")]

8
Scenes/Props/Shelf.tscn Normal file
View file

@ -0,0 +1,8 @@
[gd_scene load_steps=2 format=3 uid="uid://cqi87wcxymbhx"]
[ext_resource type="Texture2D" uid="uid://brgym86p3dt2k" path="res://ExternalMaterial/Shelf/Shelf.png" id="1_nt0bt"]
[node name="Shelf" type="Node2D"]
[node name="Sprite2D" type="Sprite2D" parent="."]
texture = ExtResource("1_nt0bt")

2
Scenes/test.tscn
View file

@ -116,7 +116,7 @@
[sub_resource type="Resource" id="Resource_6sau4"]
script = ExtResource("7_l32kg")
EggIndex = 0
StartingEquipment = Array[ExtResource("6_8tdlb")]([ExtResource("6_khabp")])
StartingEquipment = [ExtResource("6_khabp")]
[sub_resource type="RectangleShape2D" id="RectangleShape2D_ksslq"]
size = Vector2(184, 46.5)