From 8eba34915d173c0c42fd4eb5a87a486ecd8be849 Mon Sep 17 00:00:00 2001 From: MaddoScientisto Date: Mon, 7 Apr 2025 23:02:33 +0200 Subject: [PATCH] Dioshes --- Scenes/Actors/Fairy_FSM.tscn | 4 +--- Scenes/Props/Dish.tscn | 8 +++++++ Scenes/Props/Dish_Small.tscn | 8 +++++++ Scenes/test.tscn | 31 ++++++++++++++------------ Sprites/Props/Dish.aseprite | 3 +++ Sprites/Props/Dish.png | 3 +++ Sprites/Props/Dish.png.import | 34 +++++++++++++++++++++++++++++ Sprites/Props/Dish_Small.aseprite | 3 +++ Sprites/Props/Dish_Small.png | 3 +++ Sprites/Props/Dish_Small.png.import | 34 +++++++++++++++++++++++++++++ 10 files changed, 114 insertions(+), 17 deletions(-) create mode 100644 Scenes/Props/Dish.tscn create mode 100644 Scenes/Props/Dish_Small.tscn create mode 100644 Sprites/Props/Dish.aseprite create mode 100644 Sprites/Props/Dish.png create mode 100644 Sprites/Props/Dish.png.import create mode 100644 Sprites/Props/Dish_Small.aseprite create mode 100644 Sprites/Props/Dish_Small.png create mode 100644 Sprites/Props/Dish_Small.png.import diff --git a/Scenes/Actors/Fairy_FSM.tscn b/Scenes/Actors/Fairy_FSM.tscn index 31a86593..7e955000 100644 --- a/Scenes/Actors/Fairy_FSM.tscn +++ b/Scenes/Actors/Fairy_FSM.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=36 format=3 uid="uid://clieeuln36a7a"] +[gd_scene load_steps=35 format=3 uid="uid://clieeuln36a7a"] [ext_resource type="Script" uid="uid://dn6dbog1s2818" path="res://Scripts/Components/FSM/Enemy/EnemyStateMachine.cs" id="1_27djw"] [ext_resource type="SpriteFrames" uid="uid://bcc5mlwwnkvri" path="res://Resources/Sprites/Fairy.tres" id="1_ho0th"] @@ -13,7 +13,6 @@ [ext_resource type="Script" uid="uid://4hwtlc1ftjsc" path="res://Scripts/Components/FSM/Enemy/Dead.cs" id="8_pi7ab"] [ext_resource type="Script" uid="uid://dj37rup1ibnn6" path="res://Scripts/Components/FSM/Enemy/Controlled.cs" id="9_f3gn5"] [ext_resource type="Script" uid="uid://cq3hkweplldbr" path="res://Scripts/Components/Actors/GenericDamageReceiver.cs" id="10_l7aey"] -[ext_resource type="PackedScene" uid="uid://dmumxecckh42r" path="res://Scenes/Activable/BrokenFloorEmitter.tscn" id="11_br0mr"] [ext_resource type="Script" uid="uid://cqwvssstkrdmw" path="res://Scripts/Components/Actors/ActorResourceProvider.cs" id="12_w08b8"] [ext_resource type="Script" uid="uid://ik7s65de723k" path="res://Scripts/Components/FSM/Enemy/NavigationMovementModule.cs" id="14_w08b8"] [ext_resource type="PackedScene" uid="uid://cj63k0dmk7tl1" path="res://Scenes/Weapons/enemy_weapon_base.tscn" id="15_ydpwc"] @@ -154,7 +153,6 @@ collision_mask = 136 script = ExtResource("10_l7aey") HealthProvider = NodePath("Health") BulletGroup = 2 -Debris = ExtResource("11_br0mr") DeleteParentOnDeath = false [node name="CollisionShape2D" type="CollisionShape2D" parent="DamageReceiver"] diff --git a/Scenes/Props/Dish.tscn b/Scenes/Props/Dish.tscn new file mode 100644 index 00000000..5d4f1929 --- /dev/null +++ b/Scenes/Props/Dish.tscn @@ -0,0 +1,8 @@ +[gd_scene load_steps=2 format=3 uid="uid://bw06me0klq1wn"] + +[ext_resource type="Texture2D" uid="uid://daj5vutvttcav" path="res://Sprites/Props/Dish.png" id="1_y0d2v"] + +[node name="Dish" type="Node2D"] + +[node name="Sprite2D" type="Sprite2D" parent="."] +texture = ExtResource("1_y0d2v") diff --git a/Scenes/Props/Dish_Small.tscn b/Scenes/Props/Dish_Small.tscn new file mode 100644 index 00000000..371ba627 --- /dev/null +++ b/Scenes/Props/Dish_Small.tscn @@ -0,0 +1,8 @@ +[gd_scene load_steps=2 format=3 uid="uid://dix864sdks8fu"] + +[ext_resource type="Texture2D" uid="uid://4xqib6bwdv3v" path="res://Sprites/Props/Dish_Small.png" id="1_j85fh"] + +[node name="DishSmall" type="Node2D"] + +[node name="Sprite2D" type="Sprite2D" parent="."] +texture = ExtResource("1_j85fh") diff --git a/Scenes/test.tscn b/Scenes/test.tscn index e99884dc..c926a9e0 100644 --- a/Scenes/test.tscn +++ b/Scenes/test.tscn @@ -64,7 +64,6 @@ [ext_resource type="PackedScene" uid="uid://dx1urm7nttkqk" path="res://Scenes/Actors/level_teleporter.tscn" id="44_q5xi2"] [ext_resource type="PackedScene" uid="uid://b0k2grrc8xp1l" path="res://Scenes/Props/BigTank.tscn" id="45_5qg27"] [ext_resource type="Script" uid="uid://bwox5lmgiijcs" path="res://Scripts/Resources/Events/ActivateEvent.cs" id="45_emjoj"] -[ext_resource type="Script" uid="uid://b5fesrd4lv8t1" path="res://Scripts/Resources/Events/EventResource.cs" id="46_0bqta"] [ext_resource type="Script" uid="uid://ddv26x2qilprb" path="res://Scripts/Resources/Events/DialogueStartEvent.cs" id="46_i0omr"] [ext_resource type="PackedScene" uid="uid://cqrkisw6jg24w" path="res://Scenes/Props/MainFrame1.tscn" id="46_ny2s2"] [ext_resource type="PackedScene" uid="uid://cdti0hnbs3e63" path="res://Scenes/Actors/RoamingSusan.tscn" id="47_u1ve6"] @@ -122,6 +121,7 @@ [ext_resource type="PackedScene" uid="uid://b4gugris5j5kd" path="res://Scenes/Activable/WallEmitter.tscn" id="113_dferh"] [ext_resource type="Resource" uid="uid://dqnvesdj0dk3v" path="res://Resources/Bullets/simple_enemy_bullet.tres" id="114_fuaed"] [ext_resource type="PackedScene" uid="uid://r70dfwgv51tw" path="res://Scenes/Props/Fridge.tscn" id="115_dferh"] +[ext_resource type="PackedScene" uid="uid://dix864sdks8fu" path="res://Scenes/Props/Dish_Small.tscn" id="115_fuaed"] [sub_resource type="RectangleShape2D" id="RectangleShape2D_ksslq"] size = Vector2(184, 46.5) @@ -717,7 +717,7 @@ Invisible = true metadata/_edit_group_ = true [node name="ScriptableAreaTrigger" parent="Parallax2D/Factory Tilemaps/LevelProps/DebugTeleporter" instance=ExtResource("43_kf3qc")] -Events = Array[ExtResource("46_0bqta")]([SubResource("Resource_usuub")]) +Events = [SubResource("Resource_usuub")] [node name="BlueKeycard2" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("35_rblsn")] position = Vector2(-1032, -317) @@ -914,7 +914,7 @@ position = Vector2(-1423, -188) [node name="LevelStartTrigger" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("43_kf3qc")] position = Vector2(-762, -129) scale = Vector2(1.455, 1.455) -Events = Array[ExtResource("46_0bqta")]([SubResource("Resource_5er5x"), SubResource("Resource_b25hy")]) +Events = [SubResource("Resource_5er5x"), SubResource("Resource_b25hy")] [node name="AreaTrigger2" parent="Parallax2D/Factory Tilemaps/LevelProps" node_paths=PackedStringArray("Target") instance=ExtResource("28_6au4t")] position = Vector2(-435, -162) @@ -957,7 +957,7 @@ metadata/_edit_group_ = true [node name="Script2" type="Node2D" parent="Parallax2D/Factory Tilemaps/LevelProps/Computer2"] position = Vector2(120, 25) script = ExtResource("42_wigyb") -Events = Array[ExtResource("46_0bqta")]([SubResource("Resource_wma5c")]) +Events = [SubResource("Resource_wma5c")] [node name="Computer6" parent="Parallax2D/Factory Tilemaps/LevelProps" node_paths=PackedStringArray("Targets") instance=ExtResource("31_243ec")] position = Vector2(-1113, -139) @@ -967,7 +967,7 @@ metadata/_edit_group_ = true [node name="Script2" type="Node2D" parent="Parallax2D/Factory Tilemaps/LevelProps/Computer6"] position = Vector2(0, 1) script = ExtResource("42_wigyb") -Events = Array[ExtResource("46_0bqta")]([SubResource("Resource_cxj4w")]) +Events = [SubResource("Resource_cxj4w")] [node name="Computer7" parent="Parallax2D/Factory Tilemaps/LevelProps" node_paths=PackedStringArray("Targets") instance=ExtResource("31_243ec")] position = Vector2(-1175.36, 213.708) @@ -978,7 +978,7 @@ metadata/_edit_group_ = true [node name="Computer7Script" type="Node2D" parent="Parallax2D/Factory Tilemaps/LevelProps/Computer7"] position = Vector2(0, 1) script = ExtResource("42_wigyb") -Events = Array[ExtResource("46_0bqta")]([SubResource("Resource_tcc7d")]) +Events = [SubResource("Resource_tcc7d")] [node name="Computer5" parent="Parallax2D/Factory Tilemaps/LevelProps" node_paths=PackedStringArray("Targets") instance=ExtResource("31_243ec")] position = Vector2(-1344, -251) @@ -986,7 +986,7 @@ Targets = [NodePath("Computer5Script")] [node name="Computer5Script" type="Node2D" parent="Parallax2D/Factory Tilemaps/LevelProps/Computer5"] script = ExtResource("42_wigyb") -Events = Array[ExtResource("46_0bqta")]([SubResource("Resource_fasrq"), SubResource("Resource_mah4x"), SubResource("Resource_0bqta")]) +Events = [SubResource("Resource_fasrq"), SubResource("Resource_mah4x"), SubResource("Resource_0bqta")] [node name="Computer3" parent="Parallax2D/Factory Tilemaps/LevelProps" node_paths=PackedStringArray("Target") instance=ExtResource("31_243ec")] position = Vector2(-612.57, -358.528) @@ -994,7 +994,7 @@ Target = NodePath("Script") [node name="Script" type="Node2D" parent="Parallax2D/Factory Tilemaps/LevelProps/Computer3"] script = ExtResource("42_wigyb") -Events = Array[ExtResource("46_0bqta")]([SubResource("Resource_o2kpk")]) +Events = [SubResource("Resource_o2kpk")] [node name="Computer4" parent="Parallax2D/Factory Tilemaps/LevelProps" node_paths=PackedStringArray("Target") instance=ExtResource("31_243ec")] position = Vector2(-791, -505) @@ -1002,7 +1002,7 @@ Target = NodePath("Node2D") [node name="Node2D" type="Node2D" parent="Parallax2D/Factory Tilemaps/LevelProps/Computer4"] script = ExtResource("42_wigyb") -Events = Array[ExtResource("46_0bqta")]([SubResource("Resource_s3g2w")]) +Events = [SubResource("Resource_s3g2w")] [node name="Label" type="Label" parent="Parallax2D/Factory Tilemaps/LevelProps/Computer4"] offset_left = -5.0 @@ -1031,11 +1031,11 @@ position = Vector2(-792, -407) [node name="BossBattleEndScript" type="Node2D" parent="Parallax2D/Factory Tilemaps/LevelProps"] position = Vector2(-1628.53, -477.628) script = ExtResource("42_wigyb") -Events = Array[ExtResource("46_0bqta")]([SubResource("Resource_068l7"), SubResource("Resource_l3nop")]) +Events = [SubResource("Resource_068l7"), SubResource("Resource_l3nop")] [node name="BossBattleStartScript" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("43_kf3qc")] position = Vector2(-1487, -396) -Events = Array[ExtResource("46_0bqta")]([SubResource("Resource_4f4id"), SubResource("Resource_s2o7m"), SubResource("Resource_b1dht"), SubResource("Resource_xrgpy"), SubResource("Resource_j86ly")]) +Events = [SubResource("Resource_4f4id"), SubResource("Resource_s2o7m"), SubResource("Resource_b1dht"), SubResource("Resource_xrgpy"), SubResource("Resource_j86ly")] [node name="Enemy13" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("47_u1ve6")] position = Vector2(-1657, -788) @@ -1162,7 +1162,7 @@ position = Vector2(-2000, -736) [node name="ControlPad8" parent="Parallax2D/Factory Tilemaps/LevelProps" node_paths=PackedStringArray("Targets") instance=ExtResource("12_hfkf1")] position = Vector2(-2027, -735) Targets = [NodePath("../HorizontalForceField")] -Requirements = Array[ExtResource("6_8tdlb")]([ExtResource("84_ma1ta")]) +Requirements = [ExtResource("84_ma1ta")] [node name="Ammo6" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("34_17pjh")] position = Vector2(-872, -220) @@ -1324,7 +1324,7 @@ position = Vector2(-2072, -211) [node name="ScriptableAreaTrigger" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("43_kf3qc")] position = Vector2(-2063, -232) -Events = Array[ExtResource("46_0bqta")]([SubResource("Resource_l476f"), SubResource("Resource_dskij")]) +Events = [SubResource("Resource_l476f"), SubResource("Resource_dskij")] [node name="ShieldExtendPickup" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("103_0bqta")] position = Vector2(-1646, 38) @@ -1452,7 +1452,7 @@ position = Vector2(-1633, 391) [node name="MovementSensorLonger" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("112_j86ly")] position = Vector2(-1495, 516) -Events = Array[ExtResource("46_0bqta")]([SubResource("Resource_uslvo")]) +Events = [SubResource("Resource_uslvo")] [node name="WallEmitter" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("113_dferh")] position = Vector2(-1480, 451) @@ -1501,6 +1501,9 @@ Target = NodePath("../HorizontalForceField6") [node name="AddendumStart" type="Marker2D" parent="Parallax2D/Factory Tilemaps/LevelProps"] position = Vector2(-1366, 358) +[node name="DishSmall" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("115_fuaed")] +position = Vector2(-1317, 263) + [node name="PlayerParent" type="Node2D" parent="Parallax2D/Factory Tilemaps"] [node name="BeamShadows" type="TileMapLayer" parent="Parallax2D/Factory Tilemaps"] diff --git a/Sprites/Props/Dish.aseprite b/Sprites/Props/Dish.aseprite new file mode 100644 index 00000000..8f4d0ab4 --- /dev/null +++ b/Sprites/Props/Dish.aseprite @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:93880255dc2c370792de4df9b9b299b211d5d8b172685ace2e008417b0e5ef54 +size 497 diff --git a/Sprites/Props/Dish.png b/Sprites/Props/Dish.png new file mode 100644 index 00000000..c0e2c8b1 --- /dev/null +++ b/Sprites/Props/Dish.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:54f90eddfed769c13799709d9e2f5ca42c582a5a71bb4359fa05987443e76f83 +size 173 diff --git a/Sprites/Props/Dish.png.import b/Sprites/Props/Dish.png.import new file mode 100644 index 00000000..58dbb080 --- /dev/null +++ b/Sprites/Props/Dish.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://daj5vutvttcav" +path="res://.godot/imported/Dish.png-9c8f0ca62a0f505b919dbc73780a4d79.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Sprites/Props/Dish.png" +dest_files=["res://.godot/imported/Dish.png-9c8f0ca62a0f505b919dbc73780a4d79.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/Sprites/Props/Dish_Small.aseprite b/Sprites/Props/Dish_Small.aseprite new file mode 100644 index 00000000..79d3b3e8 --- /dev/null +++ b/Sprites/Props/Dish_Small.aseprite @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ea67910669c4a74d66ada2dc3d4881f7ae5fd33570159cf074a7cf7c4b8f1934 +size 478 diff --git a/Sprites/Props/Dish_Small.png b/Sprites/Props/Dish_Small.png new file mode 100644 index 00000000..31a8ad41 --- /dev/null +++ b/Sprites/Props/Dish_Small.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:de4202ec1abd0fa7e76476735627ecd23d3f98f9e67e9ecd849fc715155aaa30 +size 165 diff --git a/Sprites/Props/Dish_Small.png.import b/Sprites/Props/Dish_Small.png.import new file mode 100644 index 00000000..e3285102 --- /dev/null +++ b/Sprites/Props/Dish_Small.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://4xqib6bwdv3v" +path="res://.godot/imported/Dish_Small.png-499c81ba058e05c4d6a896bf32663897.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Sprites/Props/Dish_Small.png" +dest_files=["res://.godot/imported/Dish_Small.png-499c81ba058e05c4d6a896bf32663897.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1