diff --git a/Zennysoft.Game.Ma/project.godot b/Zennysoft.Game.Ma/project.godot index 1bb522f17..46162e048 100644 --- a/Zennysoft.Game.Ma/project.godot +++ b/Zennysoft.Game.Ma/project.godot @@ -270,7 +270,7 @@ EnemyViewerWalk={ [internationalization] -locale/translations_pot_files=PackedStringArray("res://src/dialog/Dialogue.dialogue", "res://src/npc/Ran/ran.dialogue", "res://src/npc/Rat/ratdialogue.dialogue", "res://src/dialog/Altar.dialogue", "res://stone.dialogue", "res://src/npc/Proscenium/JumpScare.dialogue") +locale/translations_pot_files=PackedStringArray("res://src/dialog/Dialogue.dialogue", "res://src/npc/Ran/ran.dialogue", "res://src/npc/Rat/ratdialogue.dialogue", "res://src/dialog/Altar.dialogue", "res://stone.dialogue", "res://src/npc/Proscenium/JumpScare.dialogue", "res://tutorialstone.dialogue") [layer_names] diff --git a/Zennysoft.Game.Ma/src/items/weapons/textures/KUBEL.PNG.import b/Zennysoft.Game.Ma/src/items/weapons/textures/KUBEL.PNG.import index 88cd7416d..1b8aa8abc 100644 --- a/Zennysoft.Game.Ma/src/items/weapons/textures/KUBEL.PNG.import +++ b/Zennysoft.Game.Ma/src/items/weapons/textures/KUBEL.PNG.import @@ -3,7 +3,7 @@ importer="texture" type="CompressedTexture2D" uid="uid://cb86dpkft2m03" -path.bptc="res://.godot/imported/KUBEL.PNG-bd6eff6ed8307de491529365dab55876.bptc.ctex" +path.bptc="res://.godot/imported/Kubel.png-c9f101c338fbe11a0030ed91a86239ab.bptc.ctex" metadata={ "imported_formats": ["s3tc_bptc"], "vram_texture": true @@ -11,8 +11,8 @@ metadata={ [deps] -source_file="res://src/items/weapons/textures/KUBEL.PNG" -dest_files=["res://.godot/imported/KUBEL.PNG-bd6eff6ed8307de491529365dab55876.bptc.ctex"] +source_file="res://src/items/weapons/textures/Kubel.png" +dest_files=["res://.godot/imported/Kubel.png-c9f101c338fbe11a0030ed91a86239ab.bptc.ctex"] [params] diff --git a/Zennysoft.Game.Ma/src/items/weapons/textures/RONDO.PNG.import b/Zennysoft.Game.Ma/src/items/weapons/textures/RONDO.PNG.import index 947fcd210..0c842ad38 100644 --- a/Zennysoft.Game.Ma/src/items/weapons/textures/RONDO.PNG.import +++ b/Zennysoft.Game.Ma/src/items/weapons/textures/RONDO.PNG.import @@ -3,7 +3,7 @@ importer="texture" type="CompressedTexture2D" uid="uid://c63uufq63qpuy" -path.bptc="res://.godot/imported/RONDO.PNG-77b50e9afaf9eb46f5672e079a5f50bf.bptc.ctex" +path.bptc="res://.godot/imported/Rondo.png-57553b850a093da6dba43a1e1947fcce.bptc.ctex" metadata={ "imported_formats": ["s3tc_bptc"], "vram_texture": true @@ -11,8 +11,8 @@ metadata={ [deps] -source_file="res://src/items/weapons/textures/RONDO.PNG" -dest_files=["res://.godot/imported/RONDO.PNG-77b50e9afaf9eb46f5672e079a5f50bf.bptc.ctex"] +source_file="res://src/items/weapons/textures/Rondo.png" +dest_files=["res://.godot/imported/Rondo.png-57553b850a093da6dba43a1e1947fcce.bptc.ctex"] [params] diff --git a/Zennysoft.Game.Ma/src/map/Map.tscn b/Zennysoft.Game.Ma/src/map/Map.tscn index 60835b8e9..d2b1bfdbd 100644 --- a/Zennysoft.Game.Ma/src/map/Map.tscn +++ b/Zennysoft.Game.Ma/src/map/Map.tscn @@ -89,7 +89,6 @@ FolderName = "Floor01" FloorOdds = Array[float]([0.33, 0.33, 0.33]) Sproingy = 0.5 Michael = 0.5 -Chariot = 5.0 [node name="Floor02" type="Node" parent="MapOrder"] script = ExtResource("2_00xd7") @@ -146,7 +145,6 @@ FolderName = "Floor07" FloorOdds = Array[float]([0.33, 0.33, 0.33]) Sara = 0.1 Ballos = 0.5 -Chariot = 0.5 AgniDemon = 0.4 GoldSproingy = 0.05 @@ -158,7 +156,6 @@ FloorName = 2 script = ExtResource("2_00xd7") FolderName = "Floor09" FloorOdds = Array[float]([0.5, 0.5]) -Chariot = 0.5 Chinthe = 0.5 GreenAmbassador = 0.1 @@ -166,7 +163,6 @@ GreenAmbassador = 0.1 script = ExtResource("2_00xd7") FolderName = "Floor10" FloorOdds = Array[float]([0.5, 0.5]) -Chariot = 0.5 Chinthe = 0.5 GreenAmbassador = 0.5 ShieldOfHeaven = 0.1 diff --git a/Zennysoft.Game.Ma/src/map/Placeables/Stele A.tscn b/Zennysoft.Game.Ma/src/map/Placeables/Stele A.tscn index d180846f3..8144a40cd 100644 --- a/Zennysoft.Game.Ma/src/map/Placeables/Stele A.tscn +++ b/Zennysoft.Game.Ma/src/map/Placeables/Stele A.tscn @@ -1,5 +1,6 @@ -[gd_scene load_steps=7 format=4 uid="uid://b3owhc620qisb"] +[gd_scene load_steps=12 format=4 uid="uid://b3owhc620qisb"] +[ext_resource type="Script" uid="uid://dcqssoikr3pl7" path="res://src/npc/Npc.cs" id="1_c03g6"] [ext_resource type="Texture2D" uid="uid://dcodsa21o3syb" path="res://src/map/assets/Steles/Steles_C024_C.jpg" id="1_o7s11"] [ext_resource type="Texture2D" uid="uid://c8nvb5jn8f6k1" path="res://src/map/assets/Steles/Steles_Untitled-1.png" id="2_u6crp"] @@ -73,7 +74,24 @@ _surfaces = [{ blend_shape_mode = 0 shadow_mesh = SubResource("ArrayMesh_ein7a") +[sub_resource type="CylinderShape3D" id="CylinderShape3D_c03g6"] +height = 20.9375 +radius = 9.34375 + +[sub_resource type="CylinderShape3D" id="CylinderShape3D_xkojd"] +height = 15.5671 +radius = 15.1045 + +[sub_resource type="CylinderShape3D" id="CylinderShape3D_flixp"] +height = 5.79199 +radius = 1.16748 + +[sub_resource type="CylinderShape3D" id="CylinderShape3D_hrxn4"] +height = 5.2554 +radius = 1.941 + [node name="SteleA" type="Node3D"] +script = ExtResource("1_c03g6") [node name="Steles_" type="Node3D" parent="."] @@ -83,3 +101,42 @@ shadow_mesh = SubResource("ArrayMesh_ein7a") transform = Transform3D(0.45, 0, 0, 0, 0.45, 0, 0, 0, 0.45, -8.22186, 1.13704, 0) mesh = SubResource("ArrayMesh_ejdd3") skeleton = NodePath("") + +[node name="DialogueZone" type="Area3D" parent="."] +unique_name_in_owner = true +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.273779, 0, 0) +collision_layer = 2 +collision_mask = 2 + +[node name="CollisionShape3D" type="CollisionShape3D" parent="DialogueZone"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.00627995, 1.69336, -0.00723076) +shape = SubResource("CylinderShape3D_c03g6") + +[node name="DialogueExitZone" type="Area3D" parent="."] +unique_name_in_owner = true +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.273779, 0, 0) +collision_layer = 2 +collision_mask = 2 + +[node name="CollisionShape3D" type="CollisionShape3D" parent="DialogueExitZone"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.00627995, 1.62122, -0.00723076) +shape = SubResource("CylinderShape3D_xkojd") + +[node name="Collision" type="RigidBody3D" parent="."] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.0978584, 0.0479951, 0) +collision_mask = 0 +gravity_scale = 0.0 + +[node name="CollisionShape3D" type="CollisionShape3D" parent="Collision"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.155303, 1.896, 0.348136) +shape = SubResource("CylinderShape3D_flixp") + +[node name="Hitbox" type="Area3D" parent="."] +unique_name_in_owner = true +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.269574, 0, 0) +collision_layer = 0 +collision_mask = 2068 + +[node name="CollisionShape3D" type="CollisionShape3D" parent="Hitbox"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.31993, 2.22978, 0.307625) +shape = SubResource("CylinderShape3D_hrxn4") diff --git a/Zennysoft.Game.Ma/src/map/Placeables/Stele B.tscn b/Zennysoft.Game.Ma/src/map/Placeables/Stele B.tscn index a63f15b95..1c28bf85d 100644 --- a/Zennysoft.Game.Ma/src/map/Placeables/Stele B.tscn +++ b/Zennysoft.Game.Ma/src/map/Placeables/Stele B.tscn @@ -1,6 +1,7 @@ -[gd_scene load_steps=9 format=4 uid="uid://r5d74jsx8tq6"] +[gd_scene load_steps=14 format=4 uid="uid://r5d74jsx8tq6"] [ext_resource type="Texture2D" uid="uid://35g2bx4vh3wd" path="res://src/map/assets/Steles/Steles_IMG0031.png" id="1_6obim"] +[ext_resource type="Script" uid="uid://dcqssoikr3pl7" path="res://src/npc/Npc.cs" id="1_ochsp"] [ext_resource type="Texture2D" uid="uid://c8nvb5jn8f6k1" path="res://src/map/assets/Steles/Steles_Untitled-1.png" id="2_ochsp"] [ext_resource type="Texture2D" uid="uid://bwelhd4sx7mkw" path="res://src/map/assets/Steles/Steles_COPPEROX.jpg" id="3_4nuqd"] @@ -102,7 +103,24 @@ _surfaces = [{ blend_shape_mode = 0 shadow_mesh = SubResource("ArrayMesh_vep6p") -[node name="SteleA" type="Node3D"] +[sub_resource type="CylinderShape3D" id="CylinderShape3D_4nuqd"] +height = 20.9375 +radius = 9.34375 + +[sub_resource type="CylinderShape3D" id="CylinderShape3D_1snst"] +height = 15.5671 +radius = 15.1045 + +[sub_resource type="CylinderShape3D" id="CylinderShape3D_ochsp"] +height = 3.86572 +radius = 1.21191 + +[sub_resource type="CylinderShape3D" id="CylinderShape3D_jdh7s"] +height = 4.34136 +radius = 1.941 + +[node name="SteleB" type="Node3D"] +script = ExtResource("1_ochsp") [node name="Steles_" type="Node3D" parent="."] @@ -110,3 +128,42 @@ shadow_mesh = SubResource("ArrayMesh_vep6p") transform = Transform3D(0.45, 0, 0, 0, 0.45, 0, 0, 0, 0.45, 0, 1.21845, 0) mesh = SubResource("ArrayMesh_emikr") skeleton = NodePath("") + +[node name="DialogueZone" type="Area3D" parent="."] +unique_name_in_owner = true +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.273779, 0, 0) +collision_layer = 2 +collision_mask = 2 + +[node name="CollisionShape3D" type="CollisionShape3D" parent="DialogueZone"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.00627995, 1.69336, -0.00723076) +shape = SubResource("CylinderShape3D_4nuqd") + +[node name="DialogueExitZone" type="Area3D" parent="."] +unique_name_in_owner = true +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.273779, 0, 0) +collision_layer = 2 +collision_mask = 2 + +[node name="CollisionShape3D" type="CollisionShape3D" parent="DialogueExitZone"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.00627995, 1.62122, -0.00723076) +shape = SubResource("CylinderShape3D_1snst") + +[node name="Collision" type="RigidBody3D" parent="."] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.0978584, 0.0479951, 0) +collision_mask = 0 +gravity_scale = 0.0 + +[node name="CollisionShape3D" type="CollisionShape3D" parent="Collision"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.0919093, 0.932861, 0.069788) +shape = SubResource("CylinderShape3D_ochsp") + +[node name="Hitbox" type="Area3D" parent="."] +unique_name_in_owner = true +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.269574, 0, 0) +collision_layer = 0 +collision_mask = 2068 + +[node name="CollisionShape3D" type="CollisionShape3D" parent="Hitbox"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.295321, 1.04856, 0) +shape = SubResource("CylinderShape3D_jdh7s") diff --git a/Zennysoft.Game.Ma/src/map/Placeables/Stele C.tscn b/Zennysoft.Game.Ma/src/map/Placeables/Stele C.tscn index cdd4dcb63..d775e213b 100644 --- a/Zennysoft.Game.Ma/src/map/Placeables/Stele C.tscn +++ b/Zennysoft.Game.Ma/src/map/Placeables/Stele C.tscn @@ -1,6 +1,7 @@ -[gd_scene load_steps=9 format=4 uid="uid://btjwytsymvxiv"] +[gd_scene load_steps=14 format=4 uid="uid://btjwytsymvxiv"] [ext_resource type="Texture2D" uid="uid://35g2bx4vh3wd" path="res://src/map/assets/Steles/Steles_IMG0031.png" id="1_mtjg5"] +[ext_resource type="Script" uid="uid://dcqssoikr3pl7" path="res://src/npc/Npc.cs" id="1_t14ca"] [ext_resource type="Texture2D" uid="uid://br8l5h7n6t41d" path="res://src/map/assets/Steles/Steles_eye.png" id="2_t14ca"] [ext_resource type="Texture2D" uid="uid://c8nvb5jn8f6k1" path="res://src/map/assets/Steles/Steles_Untitled-1.png" id="3_1uk4s"] @@ -109,12 +110,65 @@ _surfaces = [{ blend_shape_mode = 0 shadow_mesh = SubResource("ArrayMesh_oi256") -[node name="SteleA" type="Node3D"] -transform = Transform3D(0.45, 0, 0, 0, 0.45, 0, 0, 0, 0.45, -0.375539, 0, 0) +[sub_resource type="CylinderShape3D" id="CylinderShape3D_1uk4s"] +height = 20.9375 +radius = 9.34375 + +[sub_resource type="CylinderShape3D" id="CylinderShape3D_lr58a"] +height = 15.5671 +radius = 15.1045 + +[sub_resource type="CapsuleShape3D" id="CapsuleShape3D_heqt4"] +radius = 0.837722 +height = 2.8375 + +[sub_resource type="CylinderShape3D" id="CylinderShape3D_wx556"] +height = 2.24425 +radius = 1.941 + +[node name="SteleC" type="Node3D"] +script = ExtResource("1_t14ca") [node name="Steles_" type="Node3D" parent="."] [node name="Cube_001" type="MeshInstance3D" parent="Steles_"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -22.263, 2.53447, -0.935844) +transform = Transform3D(0.45, 0, 0, 0, 0.45, 0, 0, 0, 0.45, -10.2297, 1.16462, -0.343826) mesh = SubResource("ArrayMesh_rms5v") skeleton = NodePath("") + +[node name="DialogueZone" type="Area3D" parent="."] +unique_name_in_owner = true +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.273779, 0, 0) +collision_layer = 2 +collision_mask = 2 + +[node name="CollisionShape3D" type="CollisionShape3D" parent="DialogueZone"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.00627995, 1.69336, -0.00723076) +shape = SubResource("CylinderShape3D_1uk4s") + +[node name="DialogueExitZone" type="Area3D" parent="."] +unique_name_in_owner = true +collision_layer = 2 +collision_mask = 2 + +[node name="CollisionShape3D" type="CollisionShape3D" parent="DialogueExitZone"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.00627995, 1.62122, -0.00723076) +shape = SubResource("CylinderShape3D_lr58a") + +[node name="Collision" type="RigidBody3D" parent="."] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.15041, 1.1325, 0) +collision_mask = 0 +gravity_scale = 0.0 + +[node name="CollisionShape3D" type="CollisionShape3D" parent="Collision"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.171734, 0, 0) +shape = SubResource("CapsuleShape3D_heqt4") + +[node name="Hitbox" type="Area3D" parent="."] +unique_name_in_owner = true +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.0312473, 0, 0) +collision_layer = 0 +collision_mask = 2068 + +[node name="CollisionShape3D" type="CollisionShape3D" parent="Hitbox"] +shape = SubResource("CylinderShape3D_wx556") diff --git a/Zennysoft.Game.Ma/src/map/Placeables/Stele D.tscn b/Zennysoft.Game.Ma/src/map/Placeables/Stele D.tscn index efd552b47..3bb880f5d 100644 --- a/Zennysoft.Game.Ma/src/map/Placeables/Stele D.tscn +++ b/Zennysoft.Game.Ma/src/map/Placeables/Stele D.tscn @@ -1,6 +1,7 @@ -[gd_scene load_steps=11 format=4 uid="uid://0aqllfpimgq"] +[gd_scene load_steps=16 format=4 uid="uid://0aqllfpimgq"] [ext_resource type="Texture2D" uid="uid://dcodsa21o3syb" path="res://src/map/assets/Steles/Steles_C024_C.jpg" id="1_eu5gg"] +[ext_resource type="Script" uid="uid://dcqssoikr3pl7" path="res://src/npc/Npc.cs" id="1_xe50d"] [ext_resource type="Texture2D" uid="uid://dj2upntyeqryx" path="res://src/map/assets/Steles/Steles_COPPWIR.jpg" id="2_xe50d"] [ext_resource type="Texture2D" uid="uid://bwelhd4sx7mkw" path="res://src/map/assets/Steles/Steles_COPPEROX.jpg" id="3_q5wc4"] [ext_resource type="Texture2D" uid="uid://c8nvb5jn8f6k1" path="res://src/map/assets/Steles/Steles_Untitled-1.png" id="4_fpef4"] @@ -131,7 +132,24 @@ _surfaces = [{ blend_shape_mode = 0 shadow_mesh = SubResource("ArrayMesh_xnulk") -[node name="SteleA" type="Node3D"] +[sub_resource type="CylinderShape3D" id="CylinderShape3D_xe50d"] +height = 20.9375 +radius = 9.34375 + +[sub_resource type="CylinderShape3D" id="CylinderShape3D_q5wc4"] +height = 15.5671 +radius = 15.1045 + +[sub_resource type="CapsuleShape3D" id="CapsuleShape3D_fpef4"] +radius = 1.3 +height = 3.0 + +[sub_resource type="CylinderShape3D" id="CylinderShape3D_w60kl"] +height = 2.24425 +radius = 1.941 + +[node name="SteleD" type="Node3D"] +script = ExtResource("1_xe50d") [node name="Steles_" type="Node3D" parent="."] @@ -139,3 +157,42 @@ shadow_mesh = SubResource("ArrayMesh_xnulk") transform = Transform3D(0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, 2.35051, 1.34928, -0.352509) mesh = SubResource("ArrayMesh_app7n") skeleton = NodePath("") + +[node name="DialogueZone" type="Area3D" parent="."] +unique_name_in_owner = true +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.273779, 0, 0) +collision_layer = 2 +collision_mask = 2 + +[node name="CollisionShape3D" type="CollisionShape3D" parent="DialogueZone"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.00627995, 1.69336, -0.00723076) +shape = SubResource("CylinderShape3D_xe50d") + +[node name="DialogueExitZone" type="Area3D" parent="."] +unique_name_in_owner = true +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.273779, 0, 0) +collision_layer = 2 +collision_mask = 2 + +[node name="CollisionShape3D" type="CollisionShape3D" parent="DialogueExitZone"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.00627995, 1.62122, -0.00723076) +shape = SubResource("CylinderShape3D_q5wc4") + +[node name="Collision" type="RigidBody3D" parent="."] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.17643, 1.18735, 0) +collision_mask = 0 +gravity_scale = 0.0 + +[node name="CollisionShape3D" type="CollisionShape3D" parent="Collision"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.153646, 0, 0.0542672) +shape = SubResource("CapsuleShape3D_fpef4") + +[node name="Hitbox" type="Area3D" parent="."] +unique_name_in_owner = true +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.269574, 0, 0) +collision_layer = 0 +collision_mask = 2068 + +[node name="CollisionShape3D" type="CollisionShape3D" parent="Hitbox"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.307513, 1.09007, 0.108534) +shape = SubResource("CylinderShape3D_w60kl") diff --git a/Zennysoft.Game.Ma/src/map/Placeables/Stele E.tscn b/Zennysoft.Game.Ma/src/map/Placeables/Stele E.tscn index 37adf741c..4db47cf4c 100644 --- a/Zennysoft.Game.Ma/src/map/Placeables/Stele E.tscn +++ b/Zennysoft.Game.Ma/src/map/Placeables/Stele E.tscn @@ -1,6 +1,7 @@ -[gd_scene load_steps=5 format=4 uid="uid://cn13lho2so7sr"] +[gd_scene load_steps=10 format=4 uid="uid://cn13lho2so7sr"] [ext_resource type="Texture2D" uid="uid://bwelhd4sx7mkw" path="res://src/map/assets/Steles/Steles_COPPEROX.jpg" id="1_2erh4"] +[ext_resource type="Script" uid="uid://dcqssoikr3pl7" path="res://src/npc/Npc.cs" id="1_kuew0"] [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_f3mmc"] resource_name = "Material.006" @@ -41,8 +42,25 @@ _surfaces = [{ blend_shape_mode = 0 shadow_mesh = SubResource("ArrayMesh_psm0w") -[node name="SteleA" type="Node3D"] +[sub_resource type="CylinderShape3D" id="CylinderShape3D_kuew0"] +height = 20.9375 +radius = 9.34375 + +[sub_resource type="CylinderShape3D" id="CylinderShape3D_yvxj1"] +height = 15.5671 +radius = 15.1045 + +[sub_resource type="CylinderShape3D" id="CylinderShape3D_jy3h7"] +height = 7.45923 +radius = 2.05713 + +[sub_resource type="CylinderShape3D" id="CylinderShape3D_m1n1c"] +height = 2.24425 +radius = 1.941 + +[node name="SteleE" type="Node3D"] transform = Transform3D(0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, 0, 0, 0) +script = ExtResource("1_kuew0") [node name="Steles_" type="Node3D" parent="."] @@ -50,3 +68,41 @@ transform = Transform3D(0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, 0, 0, 0) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -4.80543, 2.55103, 0) mesh = SubResource("ArrayMesh_foqvg") skeleton = NodePath("") + +[node name="DialogueZone" type="Area3D" parent="."] +unique_name_in_owner = true +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.273779, 0, 0) +collision_layer = 2 +collision_mask = 2 + +[node name="CollisionShape3D" type="CollisionShape3D" parent="DialogueZone"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.00627995, 1.69336, -0.00723076) +shape = SubResource("CylinderShape3D_kuew0") + +[node name="DialogueExitZone" type="Area3D" parent="."] +unique_name_in_owner = true +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.273779, 0, 0) +collision_layer = 2 +collision_mask = 2 + +[node name="CollisionShape3D" type="CollisionShape3D" parent="DialogueExitZone"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.00627995, 1.62122, -0.00723076) +shape = SubResource("CylinderShape3D_yvxj1") + +[node name="Collision" type="RigidBody3D" parent="."] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.0978584, 0.0479951, 0) +collision_mask = 0 +gravity_scale = 0.0 + +[node name="CollisionShape3D" type="CollisionShape3D" parent="Collision"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.171734, 2.72961, 0.401873) +shape = SubResource("CylinderShape3D_jy3h7") + +[node name="Hitbox" type="Area3D" parent="."] +unique_name_in_owner = true +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.269574, 0, 0.487987) +collision_layer = 0 +collision_mask = 2068 + +[node name="CollisionShape3D" type="CollisionShape3D" parent="Hitbox"] +shape = SubResource("CylinderShape3D_m1n1c") diff --git a/Zennysoft.Game.Ma/src/map/Placeables/Stele F.tscn b/Zennysoft.Game.Ma/src/map/Placeables/Stele F.tscn index 848feb911..7af050df7 100644 --- a/Zennysoft.Game.Ma/src/map/Placeables/Stele F.tscn +++ b/Zennysoft.Game.Ma/src/map/Placeables/Stele F.tscn @@ -1,5 +1,6 @@ -[gd_scene load_steps=8 format=4 uid="uid://d6pjtdg6wh38"] +[gd_scene load_steps=13 format=4 uid="uid://d6pjtdg6wh38"] +[ext_resource type="Script" uid="uid://dcqssoikr3pl7" path="res://src/npc/Npc.cs" id="1_38s7d"] [ext_resource type="Texture2D" uid="uid://br0vjonsyq32m" path="res://src/map/assets/Steles/Steles_ALUMPLAT.jpg" id="1_hc3bc"] [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_a85ng"] @@ -106,7 +107,23 @@ _surfaces = [{ blend_shape_mode = 0 shadow_mesh = SubResource("ArrayMesh_vdjci") -[node name="SteleA" type="Node3D"] +[sub_resource type="CylinderShape3D" id="CylinderShape3D_y65cn"] +height = 20.9375 +radius = 9.34375 + +[sub_resource type="CylinderShape3D" id="CylinderShape3D_qws0o"] +height = 15.5671 +radius = 15.1045 + +[sub_resource type="CylinderShape3D" id="CylinderShape3D_38s7d"] +radius = 0.709473 + +[sub_resource type="CylinderShape3D" id="CylinderShape3D_sma6b"] +height = 2.24425 +radius = 1.941 + +[node name="SteleF" type="Node3D"] +script = ExtResource("1_38s7d") [node name="Steles_" type="Node3D" parent="."] @@ -119,3 +136,42 @@ skeleton = NodePath("") transform = Transform3D(0.45, 0, 0, 0, 0.45, 0, 0, 0, 0.45, -4.08766, 1.19309, -0.200031) mesh = SubResource("ArrayMesh_sqhs8") skeleton = NodePath("") + +[node name="DialogueZone" type="Area3D" parent="."] +unique_name_in_owner = true +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.273779, 0, 0) +collision_layer = 2 +collision_mask = 2 + +[node name="CollisionShape3D" type="CollisionShape3D" parent="DialogueZone"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.00627995, 1.69336, -0.00723076) +shape = SubResource("CylinderShape3D_y65cn") + +[node name="DialogueExitZone" type="Area3D" parent="."] +unique_name_in_owner = true +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.273779, 0, 0) +collision_layer = 2 +collision_mask = 2 + +[node name="CollisionShape3D" type="CollisionShape3D" parent="DialogueExitZone"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.00627995, 1.62122, -0.00723076) +shape = SubResource("CylinderShape3D_qws0o") + +[node name="Collision" type="RigidBody3D" parent="."] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.0978584, 0.0479951, 0) +collision_mask = 0 +gravity_scale = 0.0 + +[node name="CollisionShape3D" type="CollisionShape3D" parent="Collision"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.142489, 0.965266, 0.039897) +shape = SubResource("CylinderShape3D_38s7d") + +[node name="Hitbox" type="Area3D" parent="."] +unique_name_in_owner = true +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.269574, 0, 0) +collision_layer = 0 +collision_mask = 2068 + +[node name="CollisionShape3D" type="CollisionShape3D" parent="Hitbox"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.36016, 0) +shape = SubResource("CylinderShape3D_sma6b") diff --git a/Zennysoft.Game.Ma/src/map/Placeables/Stele G.tscn b/Zennysoft.Game.Ma/src/map/Placeables/Stele G.tscn index c6ab3b503..d2fe87c68 100644 --- a/Zennysoft.Game.Ma/src/map/Placeables/Stele G.tscn +++ b/Zennysoft.Game.Ma/src/map/Placeables/Stele G.tscn @@ -1,6 +1,7 @@ -[gd_scene load_steps=7 format=4 uid="uid://bxjcnuf2g8iox"] +[gd_scene load_steps=12 format=4 uid="uid://bxjcnuf2g8iox"] [ext_resource type="Texture2D" uid="uid://35g2bx4vh3wd" path="res://src/map/assets/Steles/Steles_IMG0031.png" id="1_nj8pm"] +[ext_resource type="Script" uid="uid://dcqssoikr3pl7" path="res://src/npc/Npc.cs" id="1_ts7fn"] [ext_resource type="Texture2D" uid="uid://jdweu6rj63e5" path="res://src/map/assets/Steles/Steles_Swirld.png" id="2_ts7fn"] [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_rgye3"] @@ -75,7 +76,24 @@ _surfaces = [{ blend_shape_mode = 0 shadow_mesh = SubResource("ArrayMesh_yk4v3") -[node name="SteleA" type="Node3D"] +[sub_resource type="CylinderShape3D" id="CylinderShape3D_dkr3t"] +height = 20.9375 +radius = 9.34375 + +[sub_resource type="CylinderShape3D" id="CylinderShape3D_vn7mj"] +height = 15.5671 +radius = 15.1045 + +[sub_resource type="CylinderShape3D" id="CylinderShape3D_ts7fn"] +height = 4.62598 +radius = 1.13965 + +[sub_resource type="CylinderShape3D" id="CylinderShape3D_feicv"] +height = 3.80425 +radius = 1.941 + +[node name="SteleG" type="Node3D"] +script = ExtResource("1_ts7fn") [node name="Steles_" type="Node3D" parent="."] @@ -85,3 +103,42 @@ mesh = SubResource("ArrayMesh_qi4tq") skeleton = NodePath("") [node name="Cylinder_006" type="Node3D" parent="Steles_"] + +[node name="DialogueZone" type="Area3D" parent="."] +unique_name_in_owner = true +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.273779, 0, 0) +collision_layer = 2 +collision_mask = 2 + +[node name="CollisionShape3D" type="CollisionShape3D" parent="DialogueZone"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.00627995, 1.69336, -0.00723076) +shape = SubResource("CylinderShape3D_dkr3t") + +[node name="DialogueExitZone" type="Area3D" parent="."] +unique_name_in_owner = true +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.273779, 0, 0) +collision_layer = 2 +collision_mask = 2 + +[node name="CollisionShape3D" type="CollisionShape3D" parent="DialogueExitZone"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.00627995, 1.62122, -0.00723076) +shape = SubResource("CylinderShape3D_vn7mj") + +[node name="Collision" type="RigidBody3D" parent="."] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.0978584, 0.0479951, 0) +collision_mask = 0 +gravity_scale = 0.0 + +[node name="CollisionShape3D" type="CollisionShape3D" parent="Collision"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.134203, 1.31299, 0.24264) +shape = SubResource("CylinderShape3D_ts7fn") + +[node name="Hitbox" type="Area3D" parent="."] +unique_name_in_owner = true +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.269574, 0, 0) +collision_layer = 0 +collision_mask = 2068 + +[node name="CollisionShape3D" type="CollisionShape3D" parent="Hitbox"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.284839, 0.780002, 0.316487) +shape = SubResource("CylinderShape3D_feicv") diff --git a/Zennysoft.Game.Ma/src/map/dungeon/floors/Special Floors/Overworld.tscn b/Zennysoft.Game.Ma/src/map/dungeon/floors/Special Floors/Overworld.tscn index 31f9212f1..0ac3e0446 100644 --- a/Zennysoft.Game.Ma/src/map/dungeon/floors/Special Floors/Overworld.tscn +++ b/Zennysoft.Game.Ma/src/map/dungeon/floors/Special Floors/Overworld.tscn @@ -1,10 +1,10 @@ -[gd_scene load_steps=359 format=4 uid="uid://dvnc26rebk6o0"] +[gd_scene load_steps=361 format=4 uid="uid://dvnc26rebk6o0"] [ext_resource type="Script" uid="uid://cuhfkyh3d7noa" path="res://src/map/dungeon/code/Overworld.cs" id="1_5hmt3"] [ext_resource type="Texture2D" uid="uid://co6h8vyi11sl2" path="res://src/map/overworld/Models/Overworld_CLOUD_RINGS_INNER_63.png" id="2_g6b7b"] -[ext_resource type="AudioStream" uid="uid://ym4ur8a2qxhp" path="res://src/audio/AMB/amb_perlin.wav" id="2_wbbo3"] -[ext_resource type="AudioStream" uid="uid://b7wxddjx3qw5o" path="res://src/audio/AMB/amb_white_noise.wav" id="3_c2gp5"] -[ext_resource type="AudioStream" uid="uid://ddii3pi8x75xc" path="res://src/audio/AMB/amb_beach.wav" id="3_pvi8n"] +[ext_resource type="AudioStream" uid="uid://dqmsaok6fyhe7" path="res://src/audio/AMB/amb_perlin.wav" id="2_wbbo3"] +[ext_resource type="AudioStream" uid="uid://dl07vg00se7hd" path="res://src/audio/AMB/amb_white_noise.wav" id="3_c2gp5"] +[ext_resource type="AudioStream" uid="uid://boypvgaweep8a" path="res://src/audio/AMB/amb_beach.wav" id="3_pvi8n"] [ext_resource type="Texture2D" uid="uid://w33fr6exryiy" path="res://src/map/overworld/Models/Overworld_CLOUD_RINGS_INNER_37.png" id="3_uyygh"] [ext_resource type="Texture2D" uid="uid://dv10yaqvp3mub" path="res://src/map/overworld/Models/Overworld_CLOUD_RINGS_INNER_71.png" id="4_r8r3k"] [ext_resource type="Shader" uid="uid://brhf7s3riyag5" path="res://src/map/map shaders/Metal.gdshader" id="5_d1qcb"] @@ -37,6 +37,8 @@ [ext_resource type="Texture2D" uid="uid://b88bm86hnc8m6" path="res://src/map/overworld/Overworld Fixes Models/Overworld Reexport Fixes_stone_column_carved.png" id="29_8ti3u"] [ext_resource type="Texture2D" uid="uid://co3s2s5tswuj4" path="res://src/map/overworld/Overworld Fixes Models/Overworld Reexport Fixes_MOSAIC.png" id="30_6gklp"] [ext_resource type="Texture2D" uid="uid://pu4o1pwi6hnf" path="res://src/map/overworld/Overworld Fixes Models/Overworld Reexport Fixes_rock_outside_colored_CORRECTED1.png" id="31_kdqo4"] +[ext_resource type="PackedScene" uid="uid://r5d74jsx8tq6" path="res://src/map/Placeables/Stele B.tscn" id="62_xqf5a"] +[ext_resource type="Resource" uid="uid://ie8a0mt0g1g4" path="res://tutorialstone.dialogue" id="63_v60tm"] [ext_resource type="Script" uid="uid://b83kye8yinfxs" path="res://src/audio/AmbientSFXPlayer3D.cs" id="66_q7hpd"] [ext_resource type="Texture2D" uid="uid://c38grr8d22ukg" path="res://src/map/assets/Overworld Assetts/cloudscape.png" id="67_uyygh"] [ext_resource type="Shader" uid="uid://d3pf3ubk3lwwt" path="res://src/map/map shaders/Overworld Sea Fog Layer.gdshader" id="70_uyygh"] @@ -3650,6 +3652,10 @@ collision_mask = 256 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -280.996, 2.8715, 88.7621) shape = SubResource("BoxShape3D_5fm5y") +[node name="SteleB" parent="." instance=ExtResource("62_xqf5a")] +transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, -327.102, 2.40999, 39.7494) +Dialogue = ExtResource("63_v60tm") + [editable path="Node3D/Actors/Rat"] [editable path="Node3D/Actors/Clalo"] [editable path="Node3D/Actors/Caretaker of Saints"] diff --git a/Zennysoft.Game.Ma/src/map/dungeon/models/Area 2/Puer/A2-Puer_AREA_2_MAIN_222STONE.png.import b/Zennysoft.Game.Ma/src/map/dungeon/models/Area 2/Puer/A2-Puer_AREA_2_MAIN_222STONE.png.import index 495df45d7..32e69d626 100644 --- a/Zennysoft.Game.Ma/src/map/dungeon/models/Area 2/Puer/A2-Puer_AREA_2_MAIN_222STONE.png.import +++ b/Zennysoft.Game.Ma/src/map/dungeon/models/Area 2/Puer/A2-Puer_AREA_2_MAIN_222STONE.png.import @@ -3,7 +3,7 @@ importer="texture" type="CompressedTexture2D" uid="uid://cp0er3xxxjkr5" -path="res://.godot/imported/a2-puer_AREA_2_MAIN_222STONE.png-139f243ac630853348798dfe584da1e0.ctex" +path="res://.godot/imported/A2-Puer_AREA_2_MAIN_222STONE.png-992459ef9849c39922a9b9e0c7774a4a.ctex" metadata={ "vram_texture": false } @@ -13,8 +13,8 @@ generator_parameters={ [deps] -source_file="res://src/map/dungeon/models/Area 2/Puer/a2-puer_AREA_2_MAIN_222STONE.png" -dest_files=["res://.godot/imported/a2-puer_AREA_2_MAIN_222STONE.png-139f243ac630853348798dfe584da1e0.ctex"] +source_file="res://src/map/dungeon/models/Area 2/Puer/A2-Puer_AREA_2_MAIN_222STONE.png" +dest_files=["res://.godot/imported/A2-Puer_AREA_2_MAIN_222STONE.png-992459ef9849c39922a9b9e0c7774a4a.ctex"] [params] diff --git a/Zennysoft.Game.Ma/src/map/dungeon/models/Area 2/Puer/A2-Puer_AREA_2_MAIN_STONE.png.import b/Zennysoft.Game.Ma/src/map/dungeon/models/Area 2/Puer/A2-Puer_AREA_2_MAIN_STONE.png.import index 21e6e0d98..6b7d90a6d 100644 --- a/Zennysoft.Game.Ma/src/map/dungeon/models/Area 2/Puer/A2-Puer_AREA_2_MAIN_STONE.png.import +++ b/Zennysoft.Game.Ma/src/map/dungeon/models/Area 2/Puer/A2-Puer_AREA_2_MAIN_STONE.png.import @@ -3,7 +3,7 @@ importer="texture" type="CompressedTexture2D" uid="uid://5r16swvuqjjg" -path="res://.godot/imported/a2-puer_AREA_2_MAIN_STONE.png-986249227e569ea1e40b4825b7f05c47.ctex" +path="res://.godot/imported/A2-Puer_AREA_2_MAIN_STONE.png-2267bd7e464cdc2e03c8954de01941bf.ctex" metadata={ "vram_texture": false } @@ -13,8 +13,8 @@ generator_parameters={ [deps] -source_file="res://src/map/dungeon/models/Area 2/Puer/a2-puer_AREA_2_MAIN_STONE.png" -dest_files=["res://.godot/imported/a2-puer_AREA_2_MAIN_STONE.png-986249227e569ea1e40b4825b7f05c47.ctex"] +source_file="res://src/map/dungeon/models/Area 2/Puer/A2-Puer_AREA_2_MAIN_STONE.png" +dest_files=["res://.godot/imported/A2-Puer_AREA_2_MAIN_STONE.png-2267bd7e464cdc2e03c8954de01941bf.ctex"] [params] diff --git a/Zennysoft.Game.Ma/src/map/dungeon/models/Area 2/Puer/A2-Puer_COLUMN_WHITE.png.import b/Zennysoft.Game.Ma/src/map/dungeon/models/Area 2/Puer/A2-Puer_COLUMN_WHITE.png.import index 04bb9e3d9..e762e21b3 100644 --- a/Zennysoft.Game.Ma/src/map/dungeon/models/Area 2/Puer/A2-Puer_COLUMN_WHITE.png.import +++ b/Zennysoft.Game.Ma/src/map/dungeon/models/Area 2/Puer/A2-Puer_COLUMN_WHITE.png.import @@ -3,7 +3,7 @@ importer="texture" type="CompressedTexture2D" uid="uid://cvnpxln2mmtkp" -path="res://.godot/imported/a2-puer_COLUMN_WHITE.png-0b80d510851319464b2ef729d8868892.ctex" +path="res://.godot/imported/A2-Puer_COLUMN_WHITE.png-18037c22b966bb159d05cb7acac1bc53.ctex" metadata={ "vram_texture": false } @@ -13,8 +13,8 @@ generator_parameters={ [deps] -source_file="res://src/map/dungeon/models/Area 2/Puer/a2-puer_COLUMN_WHITE.png" -dest_files=["res://.godot/imported/a2-puer_COLUMN_WHITE.png-0b80d510851319464b2ef729d8868892.ctex"] +source_file="res://src/map/dungeon/models/Area 2/Puer/A2-Puer_COLUMN_WHITE.png" +dest_files=["res://.godot/imported/A2-Puer_COLUMN_WHITE.png-18037c22b966bb159d05cb7acac1bc53.ctex"] [params] diff --git a/Zennysoft.Game.Ma/src/map/dungeon/models/Area 2/Puer/A2-Puer_GREENBIT.png.import b/Zennysoft.Game.Ma/src/map/dungeon/models/Area 2/Puer/A2-Puer_GREENBIT.png.import index 180e28565..9e3842f74 100644 --- a/Zennysoft.Game.Ma/src/map/dungeon/models/Area 2/Puer/A2-Puer_GREENBIT.png.import +++ b/Zennysoft.Game.Ma/src/map/dungeon/models/Area 2/Puer/A2-Puer_GREENBIT.png.import @@ -3,7 +3,7 @@ importer="texture" type="CompressedTexture2D" uid="uid://tjtjbktl51kd" -path="res://.godot/imported/a2-puer_GREENBIT.png-e1ed395f917a2fe57ed6288185af0729.ctex" +path="res://.godot/imported/A2-Puer_GREENBIT.png-40a9ca6a0efc569a5f329f19b3c3e572.ctex" metadata={ "vram_texture": false } @@ -13,8 +13,8 @@ generator_parameters={ [deps] -source_file="res://src/map/dungeon/models/Area 2/Puer/a2-puer_GREENBIT.png" -dest_files=["res://.godot/imported/a2-puer_GREENBIT.png-e1ed395f917a2fe57ed6288185af0729.ctex"] +source_file="res://src/map/dungeon/models/Area 2/Puer/A2-Puer_GREENBIT.png" +dest_files=["res://.godot/imported/A2-Puer_GREENBIT.png-40a9ca6a0efc569a5f329f19b3c3e572.ctex"] [params] diff --git a/Zennysoft.Game.Ma/src/map/dungeon/models/Area 2/Puer/A2-Puer_M13_14.png.import b/Zennysoft.Game.Ma/src/map/dungeon/models/Area 2/Puer/A2-Puer_M13_14.png.import index 3ebf2724e..9338c9fcb 100644 --- a/Zennysoft.Game.Ma/src/map/dungeon/models/Area 2/Puer/A2-Puer_M13_14.png.import +++ b/Zennysoft.Game.Ma/src/map/dungeon/models/Area 2/Puer/A2-Puer_M13_14.png.import @@ -3,7 +3,7 @@ importer="texture" type="CompressedTexture2D" uid="uid://dqfdyguq83bhs" -path="res://.godot/imported/a2-puer_M13_14.png-ed8b29b0af1c2b973bfaee62e57cab14.ctex" +path="res://.godot/imported/A2-Puer_M13_14.png-e781478f15895763a566a64ff37db311.ctex" metadata={ "vram_texture": false } @@ -13,8 +13,8 @@ generator_parameters={ [deps] -source_file="res://src/map/dungeon/models/Area 2/Puer/a2-puer_M13_14.png" -dest_files=["res://.godot/imported/a2-puer_M13_14.png-ed8b29b0af1c2b973bfaee62e57cab14.ctex"] +source_file="res://src/map/dungeon/models/Area 2/Puer/A2-Puer_M13_14.png" +dest_files=["res://.godot/imported/A2-Puer_M13_14.png-e781478f15895763a566a64ff37db311.ctex"] [params] diff --git a/Zennysoft.Game.Ma/src/map/dungeon/models/Area 2/Puer/A2-Puer_M13_49.png.import b/Zennysoft.Game.Ma/src/map/dungeon/models/Area 2/Puer/A2-Puer_M13_49.png.import index 4508979cd..80697846d 100644 --- a/Zennysoft.Game.Ma/src/map/dungeon/models/Area 2/Puer/A2-Puer_M13_49.png.import +++ b/Zennysoft.Game.Ma/src/map/dungeon/models/Area 2/Puer/A2-Puer_M13_49.png.import @@ -3,7 +3,7 @@ importer="texture" type="CompressedTexture2D" uid="uid://dorqwrqy03rim" -path="res://.godot/imported/a2-puer_M13_49.png-86429b5a3cd80a9159f32ded99a631bc.ctex" +path="res://.godot/imported/A2-Puer_M13_49.png-44faadb5ae300e9ecea145cfe1949536.ctex" metadata={ "vram_texture": false } @@ -13,8 +13,8 @@ generator_parameters={ [deps] -source_file="res://src/map/dungeon/models/Area 2/Puer/a2-puer_M13_49.png" -dest_files=["res://.godot/imported/a2-puer_M13_49.png-86429b5a3cd80a9159f32ded99a631bc.ctex"] +source_file="res://src/map/dungeon/models/Area 2/Puer/A2-Puer_M13_49.png" +dest_files=["res://.godot/imported/A2-Puer_M13_49.png-44faadb5ae300e9ecea145cfe1949536.ctex"] [params] diff --git a/Zennysoft.Game.Ma/src/map/dungeon/models/Area 2/Puer/A2-Puer_RUBBLE_1.png.import b/Zennysoft.Game.Ma/src/map/dungeon/models/Area 2/Puer/A2-Puer_RUBBLE_1.png.import index db04979bf..1d382c04e 100644 --- a/Zennysoft.Game.Ma/src/map/dungeon/models/Area 2/Puer/A2-Puer_RUBBLE_1.png.import +++ b/Zennysoft.Game.Ma/src/map/dungeon/models/Area 2/Puer/A2-Puer_RUBBLE_1.png.import @@ -3,7 +3,7 @@ importer="texture" type="CompressedTexture2D" uid="uid://nl3bwenfa8fi" -path="res://.godot/imported/a2-puer_RUBBLE_1.png-c7185e2aad2613007d1951f1515ef882.ctex" +path="res://.godot/imported/A2-Puer_RUBBLE_1.png-72d7ff861d1df58d800502546da8d607.ctex" metadata={ "vram_texture": false } @@ -13,8 +13,8 @@ generator_parameters={ [deps] -source_file="res://src/map/dungeon/models/Area 2/Puer/a2-puer_RUBBLE_1.png" -dest_files=["res://.godot/imported/a2-puer_RUBBLE_1.png-c7185e2aad2613007d1951f1515ef882.ctex"] +source_file="res://src/map/dungeon/models/Area 2/Puer/A2-Puer_RUBBLE_1.png" +dest_files=["res://.godot/imported/A2-Puer_RUBBLE_1.png-72d7ff861d1df58d800502546da8d607.ctex"] [params] diff --git a/Zennysoft.Game.Ma/src/map/dungeon/models/Area 2/Puer/A2-Puer_STUCCO_DECAL_BIG.png.import b/Zennysoft.Game.Ma/src/map/dungeon/models/Area 2/Puer/A2-Puer_STUCCO_DECAL_BIG.png.import index f0fbaffea..09c9a2eaa 100644 --- a/Zennysoft.Game.Ma/src/map/dungeon/models/Area 2/Puer/A2-Puer_STUCCO_DECAL_BIG.png.import +++ b/Zennysoft.Game.Ma/src/map/dungeon/models/Area 2/Puer/A2-Puer_STUCCO_DECAL_BIG.png.import @@ -3,7 +3,7 @@ importer="texture" type="CompressedTexture2D" uid="uid://0p6suo7fpxum" -path="res://.godot/imported/a2-puer_STUCCO_DECAL_BIG.png-882b477f490f6ddbf5bffb3a6f8904e1.ctex" +path="res://.godot/imported/A2-Puer_STUCCO_DECAL_BIG.png-015d9f8dd06372231a1f422979d3604e.ctex" metadata={ "vram_texture": false } @@ -13,8 +13,8 @@ generator_parameters={ [deps] -source_file="res://src/map/dungeon/models/Area 2/Puer/a2-puer_STUCCO_DECAL_BIG.png" -dest_files=["res://.godot/imported/a2-puer_STUCCO_DECAL_BIG.png-882b477f490f6ddbf5bffb3a6f8904e1.ctex"] +source_file="res://src/map/dungeon/models/Area 2/Puer/A2-Puer_STUCCO_DECAL_BIG.png" +dest_files=["res://.godot/imported/A2-Puer_STUCCO_DECAL_BIG.png-015d9f8dd06372231a1f422979d3604e.ctex"] [params] diff --git a/Zennysoft.Game.Ma/src/map/dungeon/models/Area 2/Puer/A2-Puer_Tile 4.png.import b/Zennysoft.Game.Ma/src/map/dungeon/models/Area 2/Puer/A2-Puer_Tile 4.png.import index 199806321..24318b1e7 100644 --- a/Zennysoft.Game.Ma/src/map/dungeon/models/Area 2/Puer/A2-Puer_Tile 4.png.import +++ b/Zennysoft.Game.Ma/src/map/dungeon/models/Area 2/Puer/A2-Puer_Tile 4.png.import @@ -3,7 +3,7 @@ importer="texture" type="CompressedTexture2D" uid="uid://ct3mkni0v0y3g" -path="res://.godot/imported/a2-puer_Tile 4.png-9d089a32db3fc38a0c5dee6cdb6d3495.ctex" +path="res://.godot/imported/A2-Puer_Tile 4.png-0cfd085ec5fcea35eb2d1373e4717f77.ctex" metadata={ "vram_texture": false } @@ -13,8 +13,8 @@ generator_parameters={ [deps] -source_file="res://src/map/dungeon/models/Area 2/Puer/a2-puer_Tile 4.png" -dest_files=["res://.godot/imported/a2-puer_Tile 4.png-9d089a32db3fc38a0c5dee6cdb6d3495.ctex"] +source_file="res://src/map/dungeon/models/Area 2/Puer/A2-Puer_Tile 4.png" +dest_files=["res://.godot/imported/A2-Puer_Tile 4.png-0cfd085ec5fcea35eb2d1373e4717f77.ctex"] [params] diff --git a/Zennysoft.Game.Ma/src/map/dungeon/models/Area 2/Puer/A2-Puer_imag2esnormal.jpg.import b/Zennysoft.Game.Ma/src/map/dungeon/models/Area 2/Puer/A2-Puer_imag2esnormal.jpg.import index 64b96d318..a2a510b2b 100644 --- a/Zennysoft.Game.Ma/src/map/dungeon/models/Area 2/Puer/A2-Puer_imag2esnormal.jpg.import +++ b/Zennysoft.Game.Ma/src/map/dungeon/models/Area 2/Puer/A2-Puer_imag2esnormal.jpg.import @@ -3,7 +3,7 @@ importer="texture" type="CompressedTexture2D" uid="uid://b40fbcriycpp5" -path="res://.godot/imported/a2-puer_imag2esnormal.jpg-d6e063b2785344af34fa3bb45d47aa2f.ctex" +path="res://.godot/imported/A2-Puer_imag2esnormal.jpg-be023c8af9ff59eedfb3ede232c75195.ctex" metadata={ "vram_texture": false } @@ -13,8 +13,8 @@ generator_parameters={ [deps] -source_file="res://src/map/dungeon/models/Area 2/Puer/a2-puer_imag2esnormal.jpg" -dest_files=["res://.godot/imported/a2-puer_imag2esnormal.jpg-d6e063b2785344af34fa3bb45d47aa2f.ctex"] +source_file="res://src/map/dungeon/models/Area 2/Puer/A2-Puer_imag2esnormal.jpg" +dest_files=["res://.godot/imported/A2-Puer_imag2esnormal.jpg-be023c8af9ff59eedfb3ede232c75195.ctex"] [params] diff --git a/Zennysoft.Game.Ma/src/map/dungeon/models/Area 2/Puer/A2-Puer_inner_rock2.png.import b/Zennysoft.Game.Ma/src/map/dungeon/models/Area 2/Puer/A2-Puer_inner_rock2.png.import index b8a78e4ab..98a06282f 100644 --- a/Zennysoft.Game.Ma/src/map/dungeon/models/Area 2/Puer/A2-Puer_inner_rock2.png.import +++ b/Zennysoft.Game.Ma/src/map/dungeon/models/Area 2/Puer/A2-Puer_inner_rock2.png.import @@ -3,7 +3,7 @@ importer="texture" type="CompressedTexture2D" uid="uid://b25r6gysyhu3e" -path="res://.godot/imported/a2-puer_inner_rock2.png-943622742770f7b55d1e40645d07d057.ctex" +path="res://.godot/imported/A2-Puer_inner_rock2.png-7c99975de214e5dddd3507f87212b910.ctex" metadata={ "vram_texture": false } @@ -13,8 +13,8 @@ generator_parameters={ [deps] -source_file="res://src/map/dungeon/models/Area 2/Puer/a2-puer_inner_rock2.png" -dest_files=["res://.godot/imported/a2-puer_inner_rock2.png-943622742770f7b55d1e40645d07d057.ctex"] +source_file="res://src/map/dungeon/models/Area 2/Puer/A2-Puer_inner_rock2.png" +dest_files=["res://.godot/imported/A2-Puer_inner_rock2.png-7c99975de214e5dddd3507f87212b910.ctex"] [params] diff --git a/Zennysoft.Game.Ma/src/map/dungeon/models/Area 2/Puer/A2-Puer_lime_hand_relief.png.import b/Zennysoft.Game.Ma/src/map/dungeon/models/Area 2/Puer/A2-Puer_lime_hand_relief.png.import index c74c8b3f7..652b45073 100644 --- a/Zennysoft.Game.Ma/src/map/dungeon/models/Area 2/Puer/A2-Puer_lime_hand_relief.png.import +++ b/Zennysoft.Game.Ma/src/map/dungeon/models/Area 2/Puer/A2-Puer_lime_hand_relief.png.import @@ -3,7 +3,7 @@ importer="texture" type="CompressedTexture2D" uid="uid://cw4hq3kofjowa" -path="res://.godot/imported/a2-puer_lime_hand_relief.png-85b73e808337e8b8841453cbda0e78cd.ctex" +path="res://.godot/imported/A2-Puer_lime_hand_relief.png-825857ea33249fe0361c829ba37bbfdb.ctex" metadata={ "vram_texture": false } @@ -13,8 +13,8 @@ generator_parameters={ [deps] -source_file="res://src/map/dungeon/models/Area 2/Puer/a2-puer_lime_hand_relief.png" -dest_files=["res://.godot/imported/a2-puer_lime_hand_relief.png-85b73e808337e8b8841453cbda0e78cd.ctex"] +source_file="res://src/map/dungeon/models/Area 2/Puer/A2-Puer_lime_hand_relief.png" +dest_files=["res://.godot/imported/A2-Puer_lime_hand_relief.png-825857ea33249fe0361c829ba37bbfdb.ctex"] [params] diff --git a/Zennysoft.Game.Ma/src/map/dungeon/models/Area 2/Puer/A2-Puer_mother_GREEN.png.import b/Zennysoft.Game.Ma/src/map/dungeon/models/Area 2/Puer/A2-Puer_mother_GREEN.png.import index 225a80ba0..daa0c8454 100644 --- a/Zennysoft.Game.Ma/src/map/dungeon/models/Area 2/Puer/A2-Puer_mother_GREEN.png.import +++ b/Zennysoft.Game.Ma/src/map/dungeon/models/Area 2/Puer/A2-Puer_mother_GREEN.png.import @@ -3,7 +3,7 @@ importer="texture" type="CompressedTexture2D" uid="uid://bqrsde28o867s" -path="res://.godot/imported/a2-puer_mother_GREEN.png-7bb7d8dd57027953ba1e08ed0c256c8b.ctex" +path="res://.godot/imported/A2-Puer_mother_GREEN.png-ba1f3d21981ed19fc5cc87868e04808c.ctex" metadata={ "vram_texture": false } @@ -13,8 +13,8 @@ generator_parameters={ [deps] -source_file="res://src/map/dungeon/models/Area 2/Puer/a2-puer_mother_GREEN.png" -dest_files=["res://.godot/imported/a2-puer_mother_GREEN.png-7bb7d8dd57027953ba1e08ed0c256c8b.ctex"] +source_file="res://src/map/dungeon/models/Area 2/Puer/A2-Puer_mother_GREEN.png" +dest_files=["res://.godot/imported/A2-Puer_mother_GREEN.png-ba1f3d21981ed19fc5cc87868e04808c.ctex"] [params] diff --git a/Zennysoft.Game.Ma/src/map/dungeon/models/Area 2/Puer/A2-Puer_swirled_column _AREA222.png.import b/Zennysoft.Game.Ma/src/map/dungeon/models/Area 2/Puer/A2-Puer_swirled_column _AREA222.png.import index d34c69948..54793d5e9 100644 --- a/Zennysoft.Game.Ma/src/map/dungeon/models/Area 2/Puer/A2-Puer_swirled_column _AREA222.png.import +++ b/Zennysoft.Game.Ma/src/map/dungeon/models/Area 2/Puer/A2-Puer_swirled_column _AREA222.png.import @@ -3,7 +3,7 @@ importer="texture" type="CompressedTexture2D" uid="uid://4aq3a26dliyg" -path="res://.godot/imported/a2-puer_swirled_column _AREA222.png-6f90c188eae5b7e81110f39984d5d43f.ctex" +path="res://.godot/imported/A2-Puer_swirled_column _AREA222.png-4842b180cffdbc0274ecb9cbbbbc8221.ctex" metadata={ "vram_texture": false } @@ -13,8 +13,8 @@ generator_parameters={ [deps] -source_file="res://src/map/dungeon/models/Area 2/Puer/a2-puer_swirled_column _AREA222.png" -dest_files=["res://.godot/imported/a2-puer_swirled_column _AREA222.png-6f90c188eae5b7e81110f39984d5d43f.ctex"] +source_file="res://src/map/dungeon/models/Area 2/Puer/A2-Puer_swirled_column _AREA222.png" +dest_files=["res://.godot/imported/A2-Puer_swirled_column _AREA222.png-4842b180cffdbc0274ecb9cbbbbc8221.ctex"] [params] diff --git a/Zennysoft.Game.Ma/src/ui/dialogue/DialogueBalloon.tscn b/Zennysoft.Game.Ma/src/ui/dialogue/DialogueBalloon.tscn index b7f4e32f2..7bd393355 100644 --- a/Zennysoft.Game.Ma/src/ui/dialogue/DialogueBalloon.tscn +++ b/Zennysoft.Game.Ma/src/ui/dialogue/DialogueBalloon.tscn @@ -165,6 +165,7 @@ theme_override_styles/normal = SubResource("StyleBoxEmpty_dboi3") text = "I do not know thee but I perceive thine sorrows vividly, for I am embraced by their brethren." skip_action = &"ui_accept" +skip_pause_at_character_if_followed_by = ")\" " seconds_per_pause_step = 0.75 [node name="CenterContainer" type="CenterContainer" parent="Balloon"] diff --git a/Zennysoft.Game.Ma/tutorialstone.dialogue b/Zennysoft.Game.Ma/tutorialstone.dialogue new file mode 100644 index 000000000..8ba9370df --- /dev/null +++ b/Zennysoft.Game.Ma/tutorialstone.dialogue @@ -0,0 +1,5 @@ +~ general +Stele B: hey i'm just a regular Stele that's an example of placing one on the map. +Stele B: just drag and drop me into a scene and then add a dialogue file with a '~general' dialogue section to the inspector of the scene file i was placed in. +Stele B: you can also change the dialogue file without restarting the game and talk to me again to get the next text. +=> END \ No newline at end of file diff --git a/Zennysoft.Game.Ma/tutorialstone.dialogue.import b/Zennysoft.Game.Ma/tutorialstone.dialogue.import new file mode 100644 index 000000000..c79e0c582 --- /dev/null +++ b/Zennysoft.Game.Ma/tutorialstone.dialogue.import @@ -0,0 +1,16 @@ +[remap] + +importer="dialogue_manager" +importer_version=15 +type="Resource" +uid="uid://ie8a0mt0g1g4" +path="res://.godot/imported/tutorialstone.dialogue-1de0fb83bb09995e60a042cae875a946.tres" + +[deps] + +source_file="res://tutorialstone.dialogue" +dest_files=["res://.godot/imported/tutorialstone.dialogue-1de0fb83bb09995e60a042cae875a946.tres"] + +[params] + +defaults=true