Khaligufzel · snipercup · Mar 5, 2024 · Nov 21, 2023 · Nov 22, 2023 · Nov 22, 2023
diff --git a/Blocks/Stairs_to_E001.tscn b/Blocks/Stairs_to_E001.tscn
diff --git a/Blocks/Stairs_to_S001.tscn b/Blocks/Stairs_to_S001.tscn
diff --git a/Blocks/Stairs_to_W001.tscn b/Blocks/Stairs_to_W001.tscn
diff --git a/Blocks/concrete_wall001.tscn b/Blocks/concrete_wall001.tscn
diff --git a/Blocks/concrete_wall002.tscn b/Blocks/concrete_wall002.tscn
diff --git a/Materials/floor1.tres → Defaults/Blocks/Materials/floor1.tres b/Materials/floor1.tres → Defaults/Blocks/Materials/floor1.tres
@@ -1,6 +1,6 @@
 [gd_resource type="StandardMaterial3D" load_steps=2 format=3 uid="uid://buj4ukj1oh4pq"]
 
-[ext_resource type="Texture2D" uid="uid://bu00lw1luehxr" path="res://Textures/Tiles/Actual textures/1.png" id="1_a2cuf"]
+[ext_resource type="Texture2D" uid="uid://bu00lw1luehxr" path="res://Defaults/Sprites/1.png" id="1_a2cuf"]
 
 [resource]
 albedo_texture = ExtResource("1_a2cuf")

diff --git a/Materials/stairs1.tres → Defaults/Blocks/Materials/stairs1.tres b/Materials/stairs1.tres → Defaults/Blocks/Materials/stairs1.tres
@@ -1,6 +1,6 @@
 [gd_resource type="StandardMaterial3D" load_steps=2 format=3 uid="uid://pdqqtb1s8g6n"]
 
-[ext_resource type="Texture2D" uid="uid://cyy4j5vso6khu" path="res://Textures/Tiles/Actual textures/4.png" id="1_rgn6b"]
+[ext_resource type="Texture2D" uid="uid://cyy4j5vso6khu" path="res://Defaults/Sprites/4.png" id="1_rgn6b"]
 
 [resource]
 shading_mode = 0

diff --git a/Blocks/grass_001.gd → Defaults/Blocks/default_block.gd b/Blocks/grass_001.gd → Defaults/Blocks/default_block.gd
@@ -1,6 +1,10 @@
 extends StaticBody3D
 
+var id: String = ""
 
 func update_texture(material: BaseMaterial3D) -> void:
 	$MeshInstance3D.mesh = BoxMesh.new()
 	$MeshInstance3D.mesh.surface_set_material(0, material)
+
+func get_texture_string() -> String:
+	return $MeshInstance3D.mesh.material.albedo_texture.resource_path
diff --git a/Blocks/grass_001.tscn → Defaults/Blocks/default_block.tscn b/Blocks/grass_001.tscn → Defaults/Blocks/default_block.tscn
@@ -1,17 +1,18 @@
 [gd_scene load_steps=5 format=3 uid="uid://cpaa3ui52a23c"]
 
-[ext_resource type="Material" uid="uid://buj4ukj1oh4pq" path="res://Materials/floor1.tres" id="1_tldl5"]
-[ext_resource type="Script" path="res://Blocks/grass_001.gd" id="1_yge5h"]
+[ext_resource type="Script" path="res://Defaults/Blocks/default_block.gd" id="1_s3i5a"]
+[ext_resource type="Material" uid="uid://buj4ukj1oh4pq" path="res://Defaults/Blocks/Materials/floor1.tres" id="2_ukdu8"]
 
 [sub_resource type="BoxMesh" id="BoxMesh_j05ve"]
-material = ExtResource("1_tldl5")
+material = ExtResource("2_ukdu8")
 
 [sub_resource type="ConvexPolygonShape3D" id="ConvexPolygonShape3D_gyg2o"]
 points = PackedVector3Array(0.5, 0.5, 0.5, 0.5, 0.5, -0.5, -0.5, 0.5, 0.5, 0.5, -0.5, 0.5, 0.5, -0.5, -0.5, -0.5, 0.5, -0.5, -0.5, -0.5, 0.5, -0.5, -0.5, -0.5)
 
 [node name="Grass001" type="StaticBody3D" groups=["navigation_mesh_source_group"]]
+transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 0, 0, 0)
 disable_mode = 1
-script = ExtResource("1_yge5h")
+script = ExtResource("1_s3i5a")
 
 [node name="MeshInstance3D" type="MeshInstance3D" parent="."]
 mesh = SubResource("BoxMesh_j05ve")

diff --git a/Defaults/Blocks/default_slope.gd b/Defaults/Blocks/default_slope.gd
@@ -0,0 +1,14 @@
+extends StaticBody3D
+
+var id: String = ""
+
+func update_texture(material: BaseMaterial3D) -> void:
+	var prism_mesh = PrismMesh.new()
+	prism_mesh.left_to_right = 1
+	prism_mesh.surface_set_material(0, material)
+
+	$MeshInstance3D.mesh = prism_mesh  # Assign the new PrismMesh to the MeshInstance3D
+
+
+func get_texture_string() -> String:
+	return $MeshInstance3D.mesh.material.albedo_texture.resource_path
diff --git a/Blocks/Stairs_to_N001.tscn → Defaults/Blocks/default_slope.tscn b/Blocks/Stairs_to_N001.tscn → Defaults/Blocks/default_slope.tscn
@@ -1,9 +1,11 @@
-[gd_scene load_steps=4 format=3 uid="uid://dnsl5rk6de7na"]
+[gd_scene load_steps=5 format=3 uid="uid://dnsl5rk6de7na"]
 
-[ext_resource type="Material" uid="uid://pdqqtb1s8g6n" path="res://Materials/stairs1.tres" id="1_r8jiw"]
+[ext_resource type="Script" path="res://Defaults/Blocks/default_slope.gd" id="1_x2ar8"]
+[ext_resource type="Material" uid="uid://pdqqtb1s8g6n" path="res://Defaults/Blocks/Materials/stairs1.tres" id="2_qnimx"]
 
 [sub_resource type="PrismMesh" id="PrismMesh_7xabc"]
-material = ExtResource("1_r8jiw")
+lightmap_size_hint = Vector2i(14, 21)
+material = ExtResource("2_qnimx")
 left_to_right = 1.0
 
 [sub_resource type="ConvexPolygonShape3D" id="ConvexPolygonShape3D_7isgt"]
@@ -12,6 +14,7 @@ points = PackedVector3Array(0.5, 0.5, 0.5, 0.5, 0.5, -0.5, -0.5, -0.5, 0.5, 0.5,
 [node name="StairsToN001" type="StaticBody3D" groups=["navigation_mesh_source_group"]]
 transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 0, 0, 0)
 disable_mode = 1
+script = ExtResource("1_x2ar8")
 
 [node name="MeshInstance3D" type="MeshInstance3D" parent="."]
 mesh = SubResource("PrismMesh_7xabc")

diff --git a/Defaults/Furniture/FurniturePhysics.tscn b/Defaults/Furniture/FurniturePhysics.tscn
@@ -0,0 +1,25 @@
+[gd_scene load_steps=5 format=3 uid="uid://cpmwu7v1r8cg8"]
+
+[ext_resource type="Script" path="res://Scripts/FurniturePhysics.gd" id="1_klkkl"]
+[ext_resource type="Texture2D" uid="uid://cqfqxgp12asw1" path="res://Mods/Core/Furniture/table_64.png" id="1_q67ig"]
+[ext_resource type="PackedScene" uid="uid://mu6nbyuq02o5" path="res://Defaults/Mobs/mob_corpse.tscn" id="2_jy8nl"]
+
+[sub_resource type="SphereShape3D" id="SphereShape3D_vweei"]
+radius = 0.2
+
+[node name="FurniturePhysics" type="RigidBody3D"]
+collision_layer = 4
+collision_mask = 7
+axis_lock_angular_x = true
+axis_lock_angular_z = true
+linear_damp = 59.0
+angular_damp = 59.0
+script = ExtResource("1_klkkl")
+corpse_scene = ExtResource("2_jy8nl")
+
+[node name="Sprite3D" type="Sprite3D" parent="."]
+transform = Transform3D(1, 0, 0, 0, -4.37114e-08, -1, 0, 1, -4.37114e-08, 0, 0, 0)
+texture = ExtResource("1_q67ig")
+
+[node name="CollisionShape3D" type="CollisionShape3D" parent="."]
+shape = SubResource("SphereShape3D_vweei")
diff --git a/Defaults/Furniture/FurnitureStatic.tscn b/Defaults/Furniture/FurnitureStatic.tscn
@@ -0,0 +1,21 @@
+[gd_scene load_steps=5 format=3 uid="uid://cm4n8cljiij4w"]
+
+[ext_resource type="Script" path="res://Scripts/FurnitureStatic.gd" id="1_wituf"]
+[ext_resource type="PackedScene" uid="uid://mu6nbyuq02o5" path="res://Defaults/Mobs/mob_corpse.tscn" id="2_ln6uk"]
+[ext_resource type="Texture2D" uid="uid://cqfqxgp12asw1" path="res://Mods/Core/Furniture/table_64.png" id="2_nt0ji"]
+
+[sub_resource type="BoxShape3D" id="BoxShape3D_23dag"]
+size = Vector3(0.4, 0.5, 0.4)
+
+[node name="FurnitureStatic" type="StaticBody3D"]
+axis_lock_angular_x = true
+axis_lock_angular_z = true
+script = ExtResource("1_wituf")
+corpse_scene = ExtResource("2_ln6uk")
+
+[node name="Sprite3D" type="Sprite3D" parent="."]
+transform = Transform3D(1, 0, 0, 0, -4.37114e-08, -1, 0, 1, -4.37114e-08, 0, 0, 0)
+texture = ExtResource("2_nt0ji")
+
+[node name="CollisionShape3D" type="CollisionShape3D" parent="."]
+shape = SubResource("BoxShape3D_23dag")
diff --git a/Defaults/Maps/Generichouse.png b/Defaults/Maps/Generichouse.png
diff --git a/Defaults/Maps/Generichouse.png.import b/Defaults/Maps/Generichouse.png.import
@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://sqi8fd2vi8jr"
+path="res://.godot/imported/Generichouse.png-54cdc2d9e4775bcd5290036badaeb324.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://Defaults/Maps/Generichouse.png"
+dest_files=["res://.godot/imported/Generichouse.png-54cdc2d9e4775bcd5290036badaeb324.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/Defaults/Mobs/mob.tscn b/Defaults/Mobs/mob.tscn
@@ -0,0 +1,114 @@
+[gd_scene load_steps=14 format=3 uid="uid://b2r6nh12wv41k"]
+
+[ext_resource type="Script" path="res://Scripts/Mob.gd" id="1_ajqy0"]
+[ext_resource type="PackedScene" uid="uid://mu6nbyuq02o5" path="res://Defaults/Mobs/mob_corpse.tscn" id="2_eldwl"]
+[ext_resource type="Script" path="res://Scripts/StateMachine.gd" id="3_qfjv5"]
+[ext_resource type="Script" path="res://Scripts/MobAttack.gd" id="4_fqxd2"]
+[ext_resource type="Script" path="res://Scripts/MobIdle.gd" id="5_qf6ud"]
+[ext_resource type="Script" path="res://Scripts/MobFollow.gd" id="6_va33k"]
+[ext_resource type="Script" path="res://Scripts/Detection.gd" id="8_ugi6q"]
+[ext_resource type="Texture2D" uid="uid://cy56wx4qynp3m" path="res://Textures/enemy.png" id="9_vd6sy"]
+[ext_resource type="Shader" path="res://transparent_lighting.gdshader" id="10_qbt4f"]
+
+[sub_resource type="SphereShape3D" id="SphereShape3D_uyii8"]
+radius = 0.357674
+
+[sub_resource type="BoxShape3D" id="BoxShape3D_kv6xp"]
+size = Vector3(0.35, 0.35, 0.35)
+
+[sub_resource type="ShaderMaterial" id="ShaderMaterial_vr552"]
+render_priority = 0
+shader = ExtResource("10_qbt4f")
+shader_parameter/color = Color(1, 0.266667, 0.0509804, 1)
+shader_parameter/energy = 1.0
+shader_parameter/tex = ExtResource("9_vd6sy")
+
+[sub_resource type="QuadMesh" id="QuadMesh_bbnvr"]
+lightmap_size_hint = Vector2i(7, 7)
+material = SubResource("ShaderMaterial_vr552")
+size = Vector2(0.5, 0.5)
+orientation = 1
+
+[node name="Mob" type="CharacterBody3D" groups=["Enemies"]]
+collision_layer = 2
+collision_mask = 3
+wall_min_slide_angle = 0.0
+floor_constant_speed = true
+script = ExtResource("1_ajqy0")
+corpse_scene = ExtResource("2_eldwl")
+
+[node name="NavigationAgent3D" type="NavigationAgent3D" parent="."]
+path_desired_distance = 0.5
+target_desired_distance = 0.5
+path_max_distance = 0.51
+avoidance_enabled = true
+debug_enabled = true
+
+[node name="StateMachine" type="Node" parent="." node_paths=PackedStringArray("initial_state")]
+script = ExtResource("3_qfjv5")
+initial_state = NodePath("MobIdle")
+
+[node name="MobAttack" type="Node3D" parent="StateMachine" node_paths=PackedStringArray("attack_timer", "mob")]
+script = ExtResource("4_fqxd2")
+attack_timer = NodePath("AttackCooldown")
+mob = NodePath("../..")
+
+[node name="AttackCooldown" type="Timer" parent="StateMachine/MobAttack"]
+
+[node name="MobIdle" type="Node3D" parent="StateMachine" node_paths=PackedStringArray("nav_agent", "mob", "moving_timer")]
+script = ExtResource("5_qf6ud")
+nav_agent = NodePath("../../NavigationAgent3D")
+mob = NodePath("../..")
+move_distance = 50.0
+moving_timer = NodePath("MovingCooldown")
+
+[node name="MovingCooldown" type="Timer" parent="StateMachine/MobIdle"]
+wait_time = 4.0
+
+[node name="MobFollow" type="Node3D" parent="StateMachine" node_paths=PackedStringArray("nav_agent", "mob", "pathfinding_timer")]
+script = ExtResource("6_va33k")
+nav_agent = NodePath("../../NavigationAgent3D")
+mob = NodePath("../..")
+mobCol = NodePath("../../CollisionShape3D")
+pathfinding_timer = NodePath("Timer")
+
+[node name="Timer" type="Timer" parent="StateMachine/MobFollow"]
+wait_time = 0.2
+autostart = true
+
+[node name="Detection" type="Node3D" parent="." node_paths=PackedStringArray("mob")]
+script = ExtResource("8_ugi6q")
+mob = NodePath("..")
+
+[node name="Sprite3D" type="Sprite3D" parent="."]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.0275174, 0)
+visible = false
+layers = 16
+gi_mode = 0
+pixel_size = 0.05
+billboard = 1
+shaded = true
+double_sided = false
+texture = ExtResource("9_vd6sy")
+
+[node name="CollisionShape3D" type="CollisionShape3D" parent="."]
+visible = false
+shape = SubResource("SphereShape3D_uyii8")
+disabled = true
+
+[node name="CollisionShape3D2" type="CollisionShape3D" parent="."]
+shape = SubResource("BoxShape3D_kv6xp")
+
+[node name="MeshInstance3D" type="MeshInstance3D" parent="."]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.20019, 0)
+layers = 16
+cast_shadow = 0
+gi_mode = 0
+mesh = SubResource("QuadMesh_bbnvr")
+
+[connection signal="timeout" from="StateMachine/MobAttack/AttackCooldown" to="StateMachine/MobAttack" method="_on_attack_cooldown_timeout"]
+[connection signal="timeout" from="StateMachine/MobIdle/MovingCooldown" to="StateMachine/MobIdle" method="_on_moving_cooldown_timeout"]
+[connection signal="timeout" from="StateMachine/MobFollow/Timer" to="StateMachine/MobFollow" method="_on_timer_timeout"]
+[connection signal="player_spotted" from="Detection" to="StateMachine/MobAttack" method="_on_detection_player_spotted"]
+[connection signal="player_spotted" from="Detection" to="StateMachine/MobIdle" method="_on_detection_player_spotted"]
+[connection signal="player_spotted" from="Detection" to="StateMachine/MobFollow" method="_on_detection_player_spotted"]