Merge branch 'main' of https://git.zenny.quest/zenayi/GameJamDungeon

Zennysoft.Game.Ma/src/enemy/enemy_types/02. michael/MichaelModelView.tscn

@@ -1,8 +1,8 @@
-[gd_scene load_steps=538 format=3 uid="uid://uqle8gaeajg6"]
+[gd_scene load_steps=537 format=3 uid="uid://uqle8gaeajg6"]
 
 [ext_resource type="Script" uid="uid://cvr1qimxpignl" path="res://src/enemy/EnemyModelView2D.cs" id="1_o4cc2"]
-[ext_resource type="Script" uid="uid://dlsgyx4i1jmp3" path="res://src/enemy/EnemyLoreInfo.cs" id="2_3eot4"]
 [ext_resource type="Texture2D" uid="uid://clpqh2pyqljkn" path="res://src/enemy/enemy_types/02. michael/animations/IDLE_WALK/BACK/Michael_Walk_Idle_Back (1).png" id="2_3g180"]
+[ext_resource type="Resource" uid="uid://6d7ivtna8dqb" path="res://src/enemy/enemy_types/02. michael/MichaelLoreInfo.tres" id="2_pqohf"]
 [ext_resource type="Texture2D" uid="uid://b0dec8ak2bo5t" path="res://src/enemy/enemy_types/02. michael/animations/IDLE_WALK/BACK/Michael_Walk_Idle_Back (2).png" id="3_fssmb"]
 [ext_resource type="Texture2D" uid="uid://tnmyksd68vmv" path="res://src/enemy/enemy_types/02. michael/animations/IDLE_WALK/BACK/Michael_Walk_Idle_Back (3).png" id="4_oy7vk"]
 [ext_resource type="Texture2D" uid="uid://duwipvc2kl6xa" path="res://src/enemy/enemy_types/02. michael/animations/IDLE_WALK/BACK/Michael_Walk_Idle_Back (4).png" id="5_7jsk6"]
@@ -86,19 +86,6 @@
 [ext_resource type="Texture2D" uid="uid://bp6npqoco5fl3" path="res://src/vfx/Enemy Affected/curse_damage.png" id="79_dta0t"]
 [ext_resource type="AudioStream" uid="uid://w6l4yoo1kcmq" path="res://src/audio/sfx/ENEMY_MICHAEL_ATTACK1.ogg" id="80_pqohf"]
 
-[sub_resource type="Resource" id="Resource_gby04"]
-script = ExtResource("2_3eot4")
-Name = "Michael"
-Description = "Basic angel guy"
-MaximumHP = ""
-ATK = ""
-DEF = ""
-Affinity = ""
-Weakness = ""
-Drop1 = ""
-Drop2 = ""
-metadata/_custom_type_script = "uid://dlsgyx4i1jmp3"
-
 [sub_resource type="ViewportTexture" id="ViewportTexture_v7t0v"]
 viewport_path = NodePath("Sprite3D/SubViewportContainer/SubViewport")
 
@@ -4363,7 +4350,7 @@ _data = {
 
 [node name="EnemyModelView" type="Node3D"]
 script = ExtResource("1_o4cc2")
-EnemyLoreInfo = SubResource("Resource_gby04")
+EnemyLoreInfo = ExtResource("2_pqohf")
 
 [node name="Sprite3D" type="Sprite3D" parent="."]
 unique_name_in_owner = true

Zennysoft.Game.Ma/src/enemy/enemy_types/04. sara/SaraModelView.tscn

@@ -1,7 +1,8 @@
-[gd_scene load_steps=627 format=3 uid="uid://g84hcmgo3gtl"]
+[gd_scene load_steps=628 format=3 uid="uid://g84hcmgo3gtl"]
 
 [ext_resource type="Script" uid="uid://cvr1qimxpignl" path="res://src/enemy/EnemyModelView2D.cs" id="1_oh25a"]
 [ext_resource type="Texture2D" uid="uid://nps7rrvkgews" path="res://src/enemy/enemy_types/04. sara/animations/IDLE+MOVE/FRONT/0001.png" id="2_8j76g"]
+[ext_resource type="Resource" uid="uid://bctxs1jlkhgmc" path="res://src/enemy/enemy_types/04. sara/SaraLoreInfo.tres" id="2_cftgd"]
 [ext_resource type="Texture2D" uid="uid://bkv7wju1531t6" path="res://src/enemy/enemy_types/04. sara/animations/IDLE+MOVE/BACK/0001.png" id="2_kaqik"]
 [ext_resource type="Texture2D" uid="uid://dlpgu5mgx57pk" path="res://src/enemy/enemy_types/04. sara/animations/IDLE+MOVE/BACK/0005.png" id="3_5qj0o"]
 [ext_resource type="Texture2D" uid="uid://cs7wf74y8vr81" path="res://src/enemy/enemy_types/04. sara/animations/IDLE+MOVE/FRONT/0005.png" id="3_jngwg"]
@@ -4989,6 +4990,7 @@ _data = {
 
 [node name="EnemyModelView" type="Node3D"]
 script = ExtResource("1_oh25a")
+EnemyLoreInfo = ExtResource("2_cftgd")
 
 [node name="Sprite3D" type="Sprite3D" parent="."]
 unique_name_in_owner = true

Zennysoft.Game.Ma/src/items/Barrier.tscn

@@ -299,19 +299,19 @@ transform = Transform3D(1, 0, 0, 0, 0.990268, 0.139173, 0, -0.139173, 0.990268,
 script = ExtResource("1_ijggi")
 
 [node name="BOTTOM" type="MeshInstance3D" parent="."]
-transform = Transform3D(0.755666, 0, 0.654957, 0, 0.0751518, 0, -0.654957, 0, 0.755666, 0, 0.00961442, 0)
+transform = Transform3D(0.6862, 0, 0.727413, 0, 0.0751518, 0, -0.727413, 0, 0.6862, 0, 0.00961442, 0)
 transparency = 1.0
 mesh = SubResource("ArrayMesh_e8pdp")
 skeleton = NodePath("")
 
 [node name="MIDDLE" type="MeshInstance3D" parent="."]
-transform = Transform3D(0.755666, 0, -0.654957, 0, 0.0751518, 0, 0.654957, 0, 0.755666, 0, 0.166192, 0)
+transform = Transform3D(0.6862, 0, -0.727413, 0, 0.0751518, 0, 0.727413, 0, 0.6862, 0, 0.166192, 0)
 transparency = 1.0
 mesh = SubResource("ArrayMesh_d377v")
 skeleton = NodePath("")
 
 [node name="TOP" type="MeshInstance3D" parent="."]
-transform = Transform3D(0.755666, 0, 0.654957, 0, 0.0751518, 0, -0.654957, 0, 0.755666, 0, 0.32277, 0)
+transform = Transform3D(0.6862, 0, 0.727413, 0, 0.0751518, 0, -0.727413, 0, 0.6862, 0, 0.32277, 0)
 transparency = 1.0
 mesh = SubResource("ArrayMesh_qll8n")
 skeleton = NodePath("")

Zennysoft.Game.Ma/src/map/dungeon/floors/Floor05/Floor 5Z.tscn

@@ -1,10 +1,11 @@
-[gd_scene load_steps=32 format=3 uid="uid://c13gaccaiv202"]
+[gd_scene load_steps=33 format=3 uid="uid://c13gaccaiv202"]
 
 [ext_resource type="PackedScene" uid="uid://by2op0p65ht27" path="res://src/map/dungeon/rooms/Set A/02. Big Block Room.tscn" id="1_7ih34"]
 [ext_resource type="Script" uid="uid://dwt6302nsf4vq" path="res://src/map/dungeon/code/DungeonFloor.cs" id="1_l4jfs"]
 [ext_resource type="PackedScene" uid="uid://dn5546yqyntfr" path="res://src/map/dungeon/rooms/Set A/10. Item Transfer Room.tscn" id="2_502ht"]
 [ext_resource type="PackedScene" uid="uid://drasshmo7ntqc" path="res://src/map/dungeon/rooms/Special Rooms/Breakable Wall Room.tscn" id="3_20m80"]
 [ext_resource type="PackedScene" uid="uid://cihbmyo0ltq4m" path="res://src/map/dungeon/rooms/Set A/19. Floor Exit A.tscn" id="4_nm3ab"]
+[ext_resource type="PackedScene" uid="uid://6ca5oildpf3n" path="res://src/items/misc/Plastique.tscn" id="5_o11y8"]
 [ext_resource type="PackedScene" uid="uid://h1ijbjf7p462" path="res://src/map/dungeon/corridors/A1 - Corridor - Corner  .tscn" id="5_xx18x"]
 [ext_resource type="PackedScene" uid="uid://8qyob3r6geey" path="res://src/map/dungeon/corridors/A1 - Corridor - 1 Block.tscn" id="6_5nybr"]
 [ext_resource type="PackedScene" uid="uid://d03tsdfy0bxf7" path="res://src/map/dungeon/corridors/A1 - Corridor - T-Block.tscn" id="7_e0v1c"]
@@ -102,6 +103,9 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.155, -0.014, -16.104)
 [node name="BreakableWallRoom" parent="NavigationRegion3D" instance=ExtResource("3_20m80")]
 transform = Transform3D(-1, 0, 8.74228e-08, 0, 1, 0, -8.74228e-08, 0, -1, 4.548, 0.489, -69.982)
 
+[node name="Plastique" parent="NavigationRegion3D/BreakableWallRoom" instance=ExtResource("5_o11y8")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -9.26497, 0, -21.1124)
+
 [node name="Node3D" parent="NavigationRegion3D" instance=ExtResource("5_xx18x")]
 transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 8.78027, 0, -27.0956)
 

Zennysoft.Game.Ma/src/map/dungeon/floors/Special Floors/00. Altar.tscn

@@ -18,7 +18,7 @@
 [ext_resource type="Texture2D" uid="uid://cx8bbg4nf5r0y" path="res://src/map/dungeon/models/Special Floors & Rooms/Altar/02_ALTAR_FLOOR_ZER0_VER_COLUM2N.png" id="15_mhar8"]
 [ext_resource type="Texture2D" uid="uid://bhttrt4aqu1d7" path="res://src/map/dungeon/models/Special Floors & Rooms/Altar/02_ALTAR_FLOOR_ZER0_VER_COLUMN.jpg" id="16_5mvkt"]
 [ext_resource type="Texture2D" uid="uid://dlpcuirysjp77" path="res://src/map/dungeon/models/Special Floors & Rooms/Altar/02_ALTAR_FLOOR_ZER0_VER_OW_DARKEST_METAL.png" id="17_5i3fp"]
-[ext_resource type="AudioStream" uid="uid://2veneecq76n7" path="res://src/audio/amb/amb_wind_loop_altar.ogg" id="19_t5dsv"]
+[ext_resource type="AudioStream" uid="uid://2veneecq76n7" path="res://src/audio/AMB/amb_wind_loop_altar.ogg" id="19_t5dsv"]
 [ext_resource type="Shader" uid="uid://c4a68uhm5o2h4" path="res://src/map/map shaders/Altar Sky Environment.gdshader" id="27_lb4gb"]
 
 [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_tyshr"]