From 063e29afe4dc50ef1544002726df1678bbce7ef6 Mon Sep 17 00:00:00 2001 From: Sofia Date: Tue, 21 Jul 2026 01:16:17 +0300 Subject: [PATCH] Integrate diner-map --- godot/maps/diner.tres | 7 +++++++ godot/maps/diner.tscn | 10 +++++++++- godot/scenes/game_manager.tscn | 3 ++- 3 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 godot/maps/diner.tres diff --git a/godot/maps/diner.tres b/godot/maps/diner.tres new file mode 100644 index 0000000..8f8741b --- /dev/null +++ b/godot/maps/diner.tres @@ -0,0 +1,7 @@ +[gd_resource type="MapResource" format=3 uid="uid://bsjoandgu476y"] + +[ext_resource type="PackedScene" uid="uid://ylj40hkjsgjc" path="res://maps/diner.tscn" id="1_yteo6"] + +[resource] +name = "Diner" +scene = ExtResource("1_yteo6") diff --git a/godot/maps/diner.tscn b/godot/maps/diner.tscn index a2cb441..f053651 100644 --- a/godot/maps/diner.tscn +++ b/godot/maps/diner.tscn @@ -1,7 +1,9 @@ [gd_scene format=4 uid="uid://ylj40hkjsgjc"] +[ext_resource type="PackedScene" uid="uid://ct70bpbca8one" path="res://scenes/player/local_player.tscn" id="1_xlrhi"] [ext_resource type="Script" uid="uid://cwu5cf7a0awcd" path="res://addons/func_godot/src/map/func_godot_map.gd" id="1_yr1i7"] [ext_resource type="Resource" uid="uid://blt2w6o2bluf" path="res://maps/meta/map_settings.tres" id="2_j6hgl"] +[ext_resource type="PackedScene" uid="uid://kfxc0migw80o" path="res://scenes/player/remote_player.tscn" id="2_jy4sn"] [ext_resource type="Material" uid="uid://hpsrvwx1o2v0" path="res://maps/materials/wall_foam.tres" id="3_p5t2c"] [ext_resource type="Material" uid="uid://jk1vi81uwn88" path="res://maps/materials/foam_trimsheet.tres" id="4_28ffs"] [ext_resource type="LightmapGIData" uid="uid://hqspy3qsl5jd" path="res://maps/diner.lmbake" id="4_j6hgl"] @@ -120,7 +122,10 @@ volumetric_fog_albedo = Color(0.8156863, 0.6392157, 0.29803923, 1) [sub_resource type="CameraAttributesPractical" id="CameraAttributesPractical_j6hgl"] exposure_multiplier = 2.641 -[node name="diner" type="Node3D" unique_id=1213249549] +[node name="diner" type="Map" unique_id=1971127396 node_paths=PackedStringArray("spawner")] +spawner = NodePath("spawner") +local_player = ExtResource("1_xlrhi") +remote_player = ExtResource("2_jy4sn") [node name="func_godot_map" type="Node3D" parent="." unique_id=473152478] script = ExtResource("1_yr1i7") @@ -201,3 +206,6 @@ shadow_enabled = true [node name="lightmap_timestamp_checker" parent="." unique_id=400431685 instance=ExtResource("8_p5t2c")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0) + +[node name="spawner" type="Node3D" parent="." unique_id=2117785064] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.739436, 0.76123095, 5.0619516) diff --git a/godot/scenes/game_manager.tscn b/godot/scenes/game_manager.tscn index b1c7fda..45863cd 100644 --- a/godot/scenes/game_manager.tscn +++ b/godot/scenes/game_manager.tscn @@ -1,7 +1,8 @@ [gd_scene format=3 uid="uid://bii6018k3ip3t"] [ext_resource type="MapResource" uid="uid://c7n1tacc7a73t" path="res://maps/default_map.tres" id="1_glms7"] +[ext_resource type="MapResource" uid="uid://bsjoandgu476y" path="res://maps/diner.tres" id="2_glms7"] [node name="game_manager" type="GameManager" unique_id=1442044769] respawn_timer = 10.0 -maps = Array[MapResource]([ExtResource("1_glms7")]) +maps = Array[MapResource]([ExtResource("1_glms7"), ExtResource("2_glms7")])