diff --git a/Resources/Debug/DebugLevels.tres b/Resources/Debug/DebugLevels.tres index 8b91e794..39a72ac8 100644 --- a/Resources/Debug/DebugLevels.tres +++ b/Resources/Debug/DebugLevels.tres @@ -19,7 +19,7 @@ _name = "Intro" [sub_resource type="Resource" id="Resource_cfhv5"] script = ExtResource("1_ov731") EggIndex = 0 -StartingEquipment = [] +StartingEquipment = Array[ExtResource("2_bkci5")]([]) [sub_resource type="Resource" id="Resource_0k62o"] script = ExtResource("2_tnajf") @@ -31,7 +31,7 @@ StartData = SubResource("Resource_cfhv5") [sub_resource type="Resource" id="Resource_tpb7s"] script = ExtResource("1_ov731") EggIndex = 0 -StartingEquipment = [] +StartingEquipment = Array[ExtResource("2_bkci5")]([]) [sub_resource type="Resource" id="Resource_edoov"] script = ExtResource("2_tnajf") @@ -43,7 +43,7 @@ StartData = SubResource("Resource_tpb7s") [sub_resource type="Resource" id="Resource_1sw5g"] script = ExtResource("1_ov731") EggIndex = 255 -StartingEquipment = [] +StartingEquipment = Array[ExtResource("2_bkci5")]([]) [sub_resource type="Resource" id="Resource_47bot"] script = ExtResource("2_tnajf") @@ -73,7 +73,7 @@ _name = "Rebel Base" [sub_resource type="Resource" id="Resource_maxpt"] script = ExtResource("1_ov731") EggIndex = 0 -StartingEquipment = [] +StartingEquipment = Array[ExtResource("2_bkci5")]([]) [sub_resource type="Resource" id="Resource_pein5"] script = ExtResource("2_tnajf") @@ -128,7 +128,7 @@ metadata/_custom_type_script = "uid://dnthdjrx78u6m" [sub_resource type="Resource" id="Resource_7sue8"] script = ExtResource("1_ov731") EggIndex = 255 -StartingEquipment = [] +StartingEquipment = Array[ExtResource("2_bkci5")]([]) metadata/_custom_type_script = "uid://mja0rk7n2kln" [sub_resource type="Resource" id="Resource_ognca"] @@ -142,7 +142,7 @@ metadata/_custom_type_script = "uid://dnthdjrx78u6m" [sub_resource type="Resource" id="Resource_olpjo"] script = ExtResource("1_ov731") EggIndex = 0 -StartingEquipment = [] +StartingEquipment = Array[ExtResource("2_bkci5")]([]) metadata/_custom_type_script = "uid://mja0rk7n2kln" [sub_resource type="Resource" id="Resource_nbnej"] diff --git a/Scenes/Actors/RebelBase.tscn b/Scenes/Actors/RebelBase.tscn index 7a8f5f2d..49d147b5 100644 --- a/Scenes/Actors/RebelBase.tscn +++ b/Scenes/Actors/RebelBase.tscn @@ -1,7 +1,8 @@ -[gd_scene load_steps=32 format=4 uid="uid://bx31ou6tw3kd1"] +[gd_scene load_steps=33 format=4 uid="uid://bx31ou6tw3kd1"] [ext_resource type="Script" uid="uid://doxmbokehw8ci" path="res://Scripts/GameManager.cs" id="1_6sq7s"] [ext_resource type="PackedScene" uid="uid://c4pr2707hbeph" path="res://Scenes/Actors/fsm_player.tscn" id="2_cicvv"] +[ext_resource type="Script" uid="uid://epnwjptvks3t" path="res://Scripts/Resources/LootItem.cs" id="3_cicvv"] [ext_resource type="Script" uid="uid://mja0rk7n2kln" path="res://Scripts/Resources/MapStartDataResource.cs" id="4_tgwif"] [ext_resource type="TileSet" uid="uid://6k28roiljylj" path="res://Tilesets/factory_tileset.tres" id="5_vmlpc"] [ext_resource type="Script" uid="uid://krean0uywtms" path="res://Scripts/TilemapAvoidance.cs" id="6_sv42c"] @@ -30,7 +31,7 @@ [sub_resource type="Resource" id="Resource_53p3c"] script = ExtResource("4_tgwif") EggIndex = 0 -StartingEquipment = [null] +StartingEquipment = Array[ExtResource("3_cicvv")]([null]) [sub_resource type="Resource" id="Resource_2ugqu"] script = ExtResource("11_esmuk") diff --git a/Scenes/Maps/PlayerFSMTest.tscn b/Scenes/Maps/PlayerFSMTest.tscn index 6625981e..be78bd95 100644 --- a/Scenes/Maps/PlayerFSMTest.tscn +++ b/Scenes/Maps/PlayerFSMTest.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=56 format=4 uid="uid://dqyfnby0t7gu1"] +[gd_scene load_steps=59 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"] @@ -44,13 +44,16 @@ [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="PackedScene" uid="uid://b0k2grrc8xp1l" path="res://Scenes/Props/BigTank.tscn" id="35_31m6w"] [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"] +[ext_resource type="Resource" uid="uid://ncukdupc7hbm" path="res://Resources/Bullets/Explosion.tres" id="36_m2siw"] +[ext_resource type="PackedScene" uid="uid://dcbcyp1qogcl0" path="res://Scenes/Props/BigTankHorizontal.tscn" id="36_tj8x8"] [sub_resource type="Resource" id="Resource_6wo78"] script = ExtResource("4_u1i8n") EggIndex = 0 -StartingEquipment = [] +StartingEquipment = Array[ExtResource("5_u1i8n")]([]) [sub_resource type="RectangleShape2D" id="RectangleShape2D_rff8l"] size = Vector2(30, 52.5) @@ -265,6 +268,14 @@ position = Vector2(354, 172) [node name="Chair" parent="Tilemaps/Actors" instance=ExtResource("33_7ft0s")] position = Vector2(260, 194) +[node name="BigTank" parent="Tilemaps/Actors" instance=ExtResource("35_31m6w")] +position = Vector2(494, 175) +ExplosionData = ExtResource("36_m2siw") + +[node name="BigTankHorizontal" parent="Tilemaps/Actors" instance=ExtResource("36_tj8x8")] +position = Vector2(475, 145) +ExplosionData = ExtResource("36_m2siw") + [node name="ScriptableAreaTrigger" parent="Tilemaps" instance=ExtResource("28_fuxq3")] position = Vector2(230, 250) Events = Array[ExtResource("35_16ubp")]([SubResource("Resource_pgobb")]) diff --git a/Scenes/Props/BigTank.tscn b/Scenes/Props/BigTank.tscn index 557affc1..f6119ef4 100644 --- a/Scenes/Props/BigTank.tscn +++ b/Scenes/Props/BigTank.tscn @@ -1,35 +1,52 @@ -[gd_scene load_steps=7 format=3 uid="uid://b0k2grrc8xp1l"] +[gd_scene load_steps=9 format=3 uid="uid://b0k2grrc8xp1l"] [ext_resource type="Script" uid="uid://cpx2fxtumgmud" path="res://Scenes/Barrel.cs" id="1_xmxyc"] -[ext_resource type="PackedScene" uid="uid://c53lpgcvld227" path="res://Scenes/Detritus.tscn" id="2_2ajyr"] +[ext_resource type="PackedScene" uid="uid://oslelh5laokm" path="res://Scenes/Props/BigTank_Broken.tscn" id="2_w1qa3"] [ext_resource type="PackedScene" uid="uid://jmijre3eaf8m" path="res://Scenes/Explosion.tscn" id="3_cvv71"] [ext_resource type="Texture2D" uid="uid://csivp4uxfmard" path="res://Sprites/Props/BigTank.png" id="4_tvvum"] +[sub_resource type="AtlasTexture" id="AtlasTexture_w1qa3"] +atlas = ExtResource("4_tvvum") +region = Rect2(0, 0, 32, 48) + +[sub_resource type="SpriteFrames" id="SpriteFrames_25x8m"] +animations = [{ +"frames": [{ +"duration": 1.0, +"texture": SubResource("AtlasTexture_w1qa3") +}], +"loop": true, +"name": &"default", +"speed": 5.0 +}] + [sub_resource type="RectangleShape2D" id="RectangleShape2D_0nhpj"] size = Vector2(32, 36) [sub_resource type="RectangleShape2D" id="RectangleShape2D_s3n6b"] size = Vector2(32, 36) -[node name="BigTank" type="Area2D"] +[node name="BigTank" type="Area2D" groups=["Destroyable"]] collision_layer = 64 -collision_mask = 10 +collision_mask = 138 script = ExtResource("1_xmxyc") Health = 16.0 -DebrisScene = ExtResource("2_2ajyr") +DebrisScene = ExtResource("2_w1qa3") ExplosionParticles = ExtResource("3_cvv71") +metadata/_edit_group_ = true -[node name="Sprite2D" type="Sprite2D" parent="."] -texture = ExtResource("4_tvvum") +[node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="."] +sprite_frames = SubResource("SpriteFrames_25x8m") [node name="CollisionShape2D" type="CollisionShape2D" parent="."] visible = false position = Vector2(0, -1) shape = SubResource("RectangleShape2D_0nhpj") -[node name="RigidBody2D" type="RigidBody2D" parent="."] +[node name="RigidBody2D" type="RigidBody2D" parent="." groups=["Solid"]] collision_layer = 64 collision_mask = 10 +gravity_scale = 0.0 [node name="CollisionShape2D" type="CollisionShape2D" parent="RigidBody2D"] visible = false diff --git a/Scenes/Props/BigTankHorizontal.tscn b/Scenes/Props/BigTankHorizontal.tscn new file mode 100644 index 00000000..edff40d4 --- /dev/null +++ b/Scenes/Props/BigTankHorizontal.tscn @@ -0,0 +1,54 @@ +[gd_scene load_steps=9 format=3 uid="uid://dcbcyp1qogcl0"] + +[ext_resource type="Script" uid="uid://cpx2fxtumgmud" path="res://Scenes/Barrel.cs" id="1_bqwe8"] +[ext_resource type="PackedScene" uid="uid://7qcjh7lo7tld" path="res://Scenes/Props/BigTankHorizontal_Broken.tscn" id="2_bqwe8"] +[ext_resource type="PackedScene" uid="uid://jmijre3eaf8m" path="res://Scenes/Explosion.tscn" id="3_wscba"] +[ext_resource type="Texture2D" uid="uid://7k40xhmawjyo" path="res://Sprites/Props/BigTankHorizontal.png" id="4_bqwe8"] + +[sub_resource type="AtlasTexture" id="AtlasTexture_bd6jr"] +atlas = ExtResource("4_bqwe8") +region = Rect2(0, 0, 32, 32) + +[sub_resource type="SpriteFrames" id="SpriteFrames_wscba"] +animations = [{ +"frames": [{ +"duration": 1.0, +"texture": SubResource("AtlasTexture_bd6jr") +}], +"loop": true, +"name": &"default", +"speed": 5.0 +}] + +[sub_resource type="RectangleShape2D" id="RectangleShape2D_0nhpj"] +size = Vector2(26, 27) + +[sub_resource type="RectangleShape2D" id="RectangleShape2D_s3n6b"] +size = Vector2(26, 27) + +[node name="BigTankHorizontal" type="Area2D" groups=["Destroyable"]] +collision_layer = 64 +collision_mask = 138 +script = ExtResource("1_bqwe8") +Health = 16.0 +DebrisScene = ExtResource("2_bqwe8") +ExplosionParticles = ExtResource("3_wscba") +metadata/_edit_group_ = true + +[node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="."] +sprite_frames = SubResource("SpriteFrames_wscba") + +[node name="CollisionShape2D" type="CollisionShape2D" parent="."] +visible = false +position = Vector2(0, -0.5) +shape = SubResource("RectangleShape2D_0nhpj") + +[node name="RigidBody2D" type="RigidBody2D" parent="." groups=["Solid"]] +collision_layer = 64 +collision_mask = 10 +gravity_scale = 0.0 + +[node name="CollisionShape2D" type="CollisionShape2D" parent="RigidBody2D"] +visible = false +position = Vector2(0, -0.5) +shape = SubResource("RectangleShape2D_s3n6b") diff --git a/Scenes/Props/BigTankHorizontal_Broken.tscn b/Scenes/Props/BigTankHorizontal_Broken.tscn new file mode 100644 index 00000000..c1d39037 --- /dev/null +++ b/Scenes/Props/BigTankHorizontal_Broken.tscn @@ -0,0 +1,49 @@ +[gd_scene load_steps=7 format=3 uid="uid://7qcjh7lo7tld"] + +[ext_resource type="Script" uid="uid://cpx2fxtumgmud" path="res://Scenes/Barrel.cs" id="1_suwhg"] +[ext_resource type="Texture2D" uid="uid://7k40xhmawjyo" path="res://Sprites/Props/BigTankHorizontal.png" id="2_suwhg"] + +[sub_resource type="AtlasTexture" id="AtlasTexture_vty3y"] +atlas = ExtResource("2_suwhg") +region = Rect2(32, 0, 32, 32) + +[sub_resource type="SpriteFrames" id="SpriteFrames_u1cn4"] +animations = [{ +"frames": [{ +"duration": 1.0, +"texture": SubResource("AtlasTexture_vty3y") +}], +"loop": true, +"name": &"default", +"speed": 5.0 +}] + +[sub_resource type="RectangleShape2D" id="RectangleShape2D_2ewfl"] +size = Vector2(28, 26) + +[sub_resource type="RectangleShape2D" id="RectangleShape2D_ss2y0"] +size = Vector2(28, 26) + +[node name="Big Tank Broken" type="Area2D" groups=["Destroyable"]] +collision_layer = 64 +collision_mask = 10 +script = ExtResource("1_suwhg") +Indestructible = true +Health = 2.0 +ExplosionRadius = 0.0 +ExplosionDamage = 0.0 +metadata/_edit_group_ = true + +[node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="."] +sprite_frames = SubResource("SpriteFrames_u1cn4") + +[node name="CollisionShape2D" type="CollisionShape2D" parent="."] +shape = SubResource("RectangleShape2D_2ewfl") + +[node name="RigidBody2D" type="RigidBody2D" parent="."] +collision_layer = 64 +collision_mask = 10 +gravity_scale = 0.0 + +[node name="CollisionShape2D" type="CollisionShape2D" parent="RigidBody2D"] +shape = SubResource("RectangleShape2D_ss2y0") diff --git a/Scenes/Props/BigTank_Broken.tscn b/Scenes/Props/BigTank_Broken.tscn new file mode 100644 index 00000000..ea161e23 --- /dev/null +++ b/Scenes/Props/BigTank_Broken.tscn @@ -0,0 +1,49 @@ +[gd_scene load_steps=7 format=3 uid="uid://oslelh5laokm"] + +[ext_resource type="Script" uid="uid://cpx2fxtumgmud" path="res://Scenes/Barrel.cs" id="1_tscp6"] +[ext_resource type="Texture2D" uid="uid://csivp4uxfmard" path="res://Sprites/Props/BigTank.png" id="2_tscp6"] + +[sub_resource type="AtlasTexture" id="AtlasTexture_i6l5p"] +atlas = ExtResource("2_tscp6") +region = Rect2(32, 0, 32, 48) + +[sub_resource type="SpriteFrames" id="SpriteFrames_012us"] +animations = [{ +"frames": [{ +"duration": 1.0, +"texture": SubResource("AtlasTexture_i6l5p") +}], +"loop": true, +"name": &"default", +"speed": 5.0 +}] + +[sub_resource type="RectangleShape2D" id="RectangleShape2D_2ewfl"] +size = Vector2(32, 48) + +[sub_resource type="RectangleShape2D" id="RectangleShape2D_ss2y0"] +size = Vector2(32, 48) + +[node name="Big Tank Broken" type="Area2D" groups=["Destroyable"]] +collision_layer = 64 +collision_mask = 10 +script = ExtResource("1_tscp6") +Indestructible = true +Health = 2.0 +ExplosionRadius = 0.0 +ExplosionDamage = 0.0 +metadata/_edit_group_ = true + +[node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="."] +sprite_frames = SubResource("SpriteFrames_012us") + +[node name="CollisionShape2D" type="CollisionShape2D" parent="."] +shape = SubResource("RectangleShape2D_2ewfl") + +[node name="RigidBody2D" type="RigidBody2D" parent="."] +collision_layer = 64 +collision_mask = 10 +gravity_scale = 0.0 + +[node name="CollisionShape2D" type="CollisionShape2D" parent="RigidBody2D"] +shape = SubResource("RectangleShape2D_ss2y0") diff --git a/Scenes/test.tscn b/Scenes/test.tscn index 1daa45b2..f072a176 100644 --- a/Scenes/test.tscn +++ b/Scenes/test.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=120 format=4 uid="uid://bv451a8wgty4u"] +[gd_scene load_steps=122 format=4 uid="uid://bv451a8wgty4u"] [ext_resource type="Script" uid="uid://doxmbokehw8ci" path="res://Scripts/GameManager.cs" id="1_8tmoj"] [ext_resource type="PackedScene" uid="uid://c4pr2707hbeph" path="res://Scenes/Actors/fsm_player.tscn" id="2_ksslq"] @@ -54,8 +54,10 @@ [ext_resource type="PackedScene" uid="uid://d0yes7huiyisw" path="res://Scenes/Items/Blue_Keycard.tscn" id="35_rblsn"] [ext_resource type="PackedScene" uid="uid://r25rq6ijgm6m" path="res://Scenes/Items/Green_Keycard.tscn" id="36_f8fh1"] [ext_resource type="PackedScene" uid="uid://dnbtou2fklyvp" path="res://Scenes/Actors/alarm_sign.tscn" id="36_rd6f6"] +[ext_resource type="PackedScene" uid="uid://dsbk2l40er2da" path="res://Scenes/Props/Box_Blue.tscn" id="37_gtga7"] [ext_resource type="PackedScene" uid="uid://c8lgk4wnyi1e6" path="res://Scenes/Actors/HealthStation.tscn" id="38_kuhg5"] [ext_resource type="Script" uid="uid://d0a0o50j82eo6" path="res://Scripts/Activables/ScriptableBase.cs" id="42_wigyb"] +[ext_resource type="Script" uid="uid://b5fesrd4lv8t1" path="res://Scripts/Resources/Events/EventResource.cs" id="42_yqnr2"] [ext_resource type="PackedScene" uid="uid://fxvlaidieiv7" path="res://Scenes/Interactable/ScriptableAreaTrigger.tscn" id="43_kf3qc"] [ext_resource type="Script" uid="uid://dkihoo85jfec5" path="res://Scripts/Resources/Events/MovePlayerEvent.cs" id="44_klwgh"] [ext_resource type="PackedScene" uid="uid://dx1urm7nttkqk" path="res://Scenes/Actors/level_teleporter.tscn" id="44_q5xi2"] @@ -198,7 +200,7 @@ ActivationType = 0 Targets = Array[NodePath]([NodePath("../Rumia")]) WaitForCompletion = true -[sub_resource type="Resource" id="Resource_dd2pu"] +[sub_resource type="Resource" id="Resource_gtga7"] resource_local_to_scene = true script = ExtResource("49_0si7g") Target = NodePath(".") @@ -222,7 +224,7 @@ SpawnMarkers = Dictionary[int, NodePath]({ 2: NodePath("Parallax2D/Factory Tilemaps/LevelProps/BossDebugTeleporterDestination"), 255: NodePath("Parallax2D/Factory Tilemaps/Debug Room/DebugRoomStartPosition") }) -StartingEquipment = [ExtResource("4_swym2"), ExtResource("5_nqier")] +StartingEquipment = Array[ExtResource("6_8tdlb")]([ExtResource("4_swym2"), ExtResource("5_nqier")]) MapStartData = SubResource("Resource_6sau4") PlayerParentNode = NodePath("Parallax2D/Factory Tilemaps/PlayerParent") metadata/_edit_lock_ = true @@ -439,6 +441,12 @@ position = Vector2(-736, -395) [node name="PointsPickup2" parent="Parallax2D/Factory Tilemaps/Debug Room" instance=ExtResource("89_pqe7f")] position = Vector2(-735, -412) +[node name="BigTank" parent="Parallax2D/Factory Tilemaps/Debug Room" instance=ExtResource("45_5qg27")] +position = Vector2(-843, -345) + +[node name="Blue Box" parent="Parallax2D/Factory Tilemaps/Debug Room" instance=ExtResource("37_gtga7")] +position = Vector2(-832, -396) + [node name="Part2" type="Node2D" parent="Parallax2D/Factory Tilemaps"] [node name="Mainframe" parent="Parallax2D/Factory Tilemaps/Part2" instance=ExtResource("13_acrmt")] @@ -534,7 +542,7 @@ Invisible = true metadata/_edit_group_ = true [node name="ScriptableAreaTrigger" parent="Parallax2D/Factory Tilemaps/LevelProps/DebugTeleporter" instance=ExtResource("43_kf3qc")] -Events = [SubResource("Resource_usuub")] +Events = Array[ExtResource("42_yqnr2")]([SubResource("Resource_usuub")]) [node name="BlueKeycard2" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("35_rblsn")] position = Vector2(-1032, -317) @@ -714,7 +722,7 @@ position = Vector2(-1506, -188) [node name="LevelStartTrigger" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("43_kf3qc")] position = Vector2(-781, -160) scale = Vector2(1.455, 1.455) -Events = [SubResource("Resource_5er5x"), SubResource("Resource_b25hy")] +Events = Array[ExtResource("42_yqnr2")]([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) @@ -756,7 +764,7 @@ Targets = [NodePath("Script2")] [node name="Script2" type="Node2D" parent="Parallax2D/Factory Tilemaps/LevelProps/Computer2"] position = Vector2(120, 25) script = ExtResource("42_wigyb") -Events = [SubResource("Resource_ji7au")] +Events = Array[ExtResource("42_yqnr2")]([SubResource("Resource_ji7au")]) [node name="Computer5" parent="Parallax2D/Factory Tilemaps/LevelProps" node_paths=PackedStringArray("Targets") instance=ExtResource("31_243ec")] position = Vector2(-1344, -251) @@ -764,7 +772,7 @@ Targets = [NodePath("Computer5Script")] [node name="Computer5Script" type="Node2D" parent="Parallax2D/Factory Tilemaps/LevelProps/Computer5"] script = ExtResource("42_wigyb") -Events = [SubResource("Resource_fasrq"), SubResource("Resource_yot54")] +Events = Array[ExtResource("42_yqnr2")]([SubResource("Resource_fasrq"), SubResource("Resource_yot54")]) [node name="Computer3" parent="Parallax2D/Factory Tilemaps/LevelProps" node_paths=PackedStringArray("Target") instance=ExtResource("31_243ec")] position = Vector2(-612.57, -358.528) @@ -772,7 +780,7 @@ Target = NodePath("Script") [node name="Script" type="Node2D" parent="Parallax2D/Factory Tilemaps/LevelProps/Computer3"] script = ExtResource("42_wigyb") -Events = [SubResource("Resource_o2kpk")] +Events = Array[ExtResource("42_yqnr2")]([SubResource("Resource_o2kpk")]) [node name="Computer4" parent="Parallax2D/Factory Tilemaps/LevelProps" node_paths=PackedStringArray("Target") instance=ExtResource("31_243ec")] position = Vector2(-791, -505) @@ -780,7 +788,7 @@ Target = NodePath("Node2D") [node name="Node2D" type="Node2D" parent="Parallax2D/Factory Tilemaps/LevelProps/Computer4"] script = ExtResource("42_wigyb") -Events = [SubResource("Resource_s3g2w")] +Events = Array[ExtResource("42_yqnr2")]([SubResource("Resource_s3g2w")]) [node name="Label" type="Label" parent="Parallax2D/Factory Tilemaps/LevelProps/Computer4"] offset_left = -5.0 @@ -808,11 +816,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 = [SubResource("Resource_068l7"), SubResource("Resource_l3nop")] +Events = Array[ExtResource("42_yqnr2")]([SubResource("Resource_068l7"), SubResource("Resource_l3nop")]) [node name="BossBattleStartScript" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("43_kf3qc")] position = Vector2(-1487, -396) -Events = [SubResource("Resource_4f4id"), SubResource("Resource_s2o7m"), SubResource("Resource_b1dht"), SubResource("Resource_xrgpy"), SubResource("Resource_dd2pu")] +Events = Array[ExtResource("42_yqnr2")]([SubResource("Resource_4f4id"), SubResource("Resource_s2o7m"), SubResource("Resource_b1dht"), SubResource("Resource_xrgpy"), SubResource("Resource_gtga7")]) [node name="Enemy13" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("47_u1ve6")] position = Vector2(-1657, -788) diff --git a/Scripts/Components/Actors/IHittable.cs.uid b/Scripts/Components/Actors/IHittable.cs.uid new file mode 100644 index 00000000..fdf8d6c8 --- /dev/null +++ b/Scripts/Components/Actors/IHittable.cs.uid @@ -0,0 +1 @@ +uid://3rv2oycmpuj8 diff --git a/Scripts/Enums/DamageAttribute.cs.uid b/Scripts/Enums/DamageAttribute.cs.uid new file mode 100644 index 00000000..069b8344 --- /dev/null +++ b/Scripts/Enums/DamageAttribute.cs.uid @@ -0,0 +1 @@ +uid://dnpk8q1o2uugv diff --git a/Sprites/Props/BigTank.aseprite b/Sprites/Props/BigTank.aseprite index 9a68d484..8cbcb131 100644 --- a/Sprites/Props/BigTank.aseprite +++ b/Sprites/Props/BigTank.aseprite @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4be13d615f229559d11553ab54e651c0124bd8ca15a891ecca8080701d423428 -size 792 +oid sha256:cdaad8d266fbcef764ebfde721a728c758f65d28c3bc13491d5330308c62660a +size 1802 diff --git a/Sprites/Props/BigTank.png b/Sprites/Props/BigTank.png index 7058ec88..57167e85 100644 --- a/Sprites/Props/BigTank.png +++ b/Sprites/Props/BigTank.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fd0223b7730b20c8e07eb9dbab45c707d88ca3ca0c3eabe0d6be885569e8569a -size 673 +oid sha256:bbbb7b9c8eaf084b273bd028e1687ab1e71bcedf9b27dda4af91c32adac4e22f +size 1131 diff --git a/Sprites/Props/BigTankHorizontal.aseprite b/Sprites/Props/BigTankHorizontal.aseprite new file mode 100644 index 00000000..df30e31d --- /dev/null +++ b/Sprites/Props/BigTankHorizontal.aseprite @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c4c7830e30d6279cd68f5bacb57a91eae38596deaa06ce440ecbc605ac897ff3 +size 1885 diff --git a/Sprites/Props/BigTankHorizontal.png b/Sprites/Props/BigTankHorizontal.png new file mode 100644 index 00000000..02f6b79f --- /dev/null +++ b/Sprites/Props/BigTankHorizontal.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8549a5798299112287e28684978eafd5ada6088457b8cc327fc48b4587e62714 +size 868 diff --git a/Sprites/Props/BigTankHorizontal.png.import b/Sprites/Props/BigTankHorizontal.png.import new file mode 100644 index 00000000..ecae04e2 --- /dev/null +++ b/Sprites/Props/BigTankHorizontal.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://7k40xhmawjyo" +path="res://.godot/imported/BigTankHorizontal.png-fbb85b17fa584f7eec61bc77d97e967b.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Sprites/Props/BigTankHorizontal.png" +dest_files=["res://.godot/imported/BigTankHorizontal.png-fbb85b17fa584f7eec61bc77d97e967b.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/project.godot b/project.godot index dd4d74a0..75904112 100644 --- a/project.godot +++ b/project.godot @@ -115,6 +115,7 @@ enabled=PackedStringArray("res://addons/dialogic/plugin.cfg", "res://addons/scen Interactable="" Solid="" Acid="" +Destroyable="" [input]