teascade/quakeball-rust
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move diner map files to maps/diner/, set collision layers/masks

Browse Source
This commit is contained in:
Jens Pitkänen 2026-07-21 01:19:27 +03:00
parent 063e29afe4
commit ec4423967b
10 changed files with 40 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
godot/maps/diner.map.import
View File

@ -1,14 +0,0 @@
[remap]
importer="func_godot.map"
type="Resource"
uid="uid://dsp1f8bvpwlfa"
path="res://.godot/imported/diner.map-697b550e0d0845187a070afd16dfbe1d.tres"
[deps]
source_file="res://maps/diner.map"
dest_files=["res://.godot/imported/diner.map-697b550e0d0845187a070afd16dfbe1d.tres"]
[params]

0
godot/maps/diner.exr → godot/maps/diner/diner.exr
View File

6
godot/maps/diner.exr.import → godot/maps/diner/diner.exr.import
View File

@ -3,7 +3,7 @@
importer="2d_array_texture"
type="CompressedTexture2DArray"
uid="uid://bhrjf03rkrnbf"
path.bptc="res://.godot/imported/diner.exr-6f77f100fbb80ff9133dc8de01c84254.bptc.ctexarray"
path.bptc="res://.godot/imported/diner.exr-84385e5b7ec90ebcec05ca2a44168e5b.bptc.ctexarray"
metadata={
"imported_formats": ["s3tc_bptc"],
"vram_texture": true
@ -11,8 +11,8 @@ metadata={
[deps]
source_file="res://maps/diner.exr"
dest_files=["res://.godot/imported/diner.exr-6f77f100fbb80ff9133dc8de01c84254.bptc.ctexarray"]
source_file="res://maps/diner/diner.exr"
dest_files=["res://.godot/imported/diner.exr-84385e5b7ec90ebcec05ca2a44168e5b.bptc.ctexarray"]
[params]

0
godot/maps/diner.lmbake → godot/maps/diner/diner.lmbake
View File

BIN
godot/maps/diner/diner.lmbake.depren Normal file
View File

Binary file not shown.

0
godot/maps/diner.map → godot/maps/diner/diner.map
View File

14
godot/maps/diner/diner.map.import Normal file
View File

@ -0,0 +1,14 @@
[remap]
importer="func_godot.map"
type="Resource"
uid="uid://dsp1f8bvpwlfa"
path="res://.godot/imported/diner.map-ccc9ee3b8d1c54f37050c18b058217d4.tres"
[deps]
source_file="res://maps/diner/diner.map"
dest_files=["res://.godot/imported/diner.map-ccc9ee3b8d1c54f37050c18b058217d4.tres"]
[params]

0
godot/maps/diner.tres → godot/maps/diner/diner.tres
View File

43
godot/maps/diner.tscn → godot/maps/diner/diner.tscn
View File

@ -1,15 +1,15 @@
[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"]
[ext_resource type="Material" uid="uid://1ine08aphdv7" path="res://maps/materials/orange_accent.tres" id="5_xlrhi"]
[ext_resource type="Material" uid="uid://qigsomjhm2nb" path="res://maps/materials/dark_accent.tres" id="6_jy4sn"]
[ext_resource type="PackedScene" uid="uid://tu330t7m1ow6" path="res://maps/meta/lightmap_timestamp_checker.tscn" id="8_p5t2c"]
[ext_resource type="PackedScene" uid="uid://ct70bpbca8one" path="res://scenes/player/local_player.tscn" id="1_wffmg"]
[ext_resource type="PackedScene" uid="uid://kfxc0migw80o" path="res://scenes/player/remote_player.tscn" id="2_msi5w"]
[ext_resource type="Script" uid="uid://cwu5cf7a0awcd" path="res://addons/func_godot/src/map/func_godot_map.gd" id="3_jyww1"]
[ext_resource type="Resource" uid="uid://blt2w6o2bluf" path="res://maps/meta/map_settings.tres" id="4_1d2sd"]
[ext_resource type="Material" uid="uid://hpsrvwx1o2v0" path="res://maps/materials/wall_foam.tres" id="5_1sdvq"]
[ext_resource type="Material" uid="uid://jk1vi81uwn88" path="res://maps/materials/foam_trimsheet.tres" id="6_h4ywl"]
[ext_resource type="Material" uid="uid://1ine08aphdv7" path="res://maps/materials/orange_accent.tres" id="7_ap2uw"]
[ext_resource type="Material" uid="uid://qigsomjhm2nb" path="res://maps/materials/dark_accent.tres" id="8_v6ly3"]
[ext_resource type="LightmapGIData" uid="uid://hqspy3qsl5jd" path="res://maps/diner/diner.lmbake" id="9_g8xwm"]
[ext_resource type="PackedScene" uid="uid://tu330t7m1ow6" path="res://maps/meta/lightmap_timestamp_checker.tscn" id="10_gpyxh"]
[sub_resource type="ArrayMesh" id="ArrayMesh_p5t2c"]
lightmap_size_hint = Vector2i(226, 230)
@ -19,7 +19,7 @@ _surfaces = [{
"format": 34359742519,
"index_count": 432,
"index_data": PackedByteArray("AAABAAIAAAACAAMABAAFAAYABAAGAAcACAAJAAoACAAKAAsADAANAA4ADAAOAA8AEAARABIAEAASABMAFAAVABYAFAAWABcAGAAZAAEAGAABAAAAGgAbABwAGgAcAB0AHgAfACAAHgAgACEAIgAjACQAIgAkACUAJgAnACgAJgAoACkAKgArACwAKgAsAC0ALgAvADAALgAwADEAMgAzAB8AMgAfAB4ANAAiACUANAAlADUANgAmACkANgApADcAOAA5ADoAOAA6ADsAPAA9AD4APAA+AD8AQABBAEIAQABCAEMARABFADMARAAzADIARgBHAEgARgBIAEkASgA2ADcASgA3AEsAFwAWAEwAFwBMAE0ATgBPAFAATgBQAFEAUgBTAFQAUgBUAFUAVgBXAFgAVgBYAFkAWgBbAFwAWgBcAF0AXgBfAGAAXgBgAGEAYgBjAGQAYgBkAGUAZgBnAGgAZgBoAGkAagBrAGwAagBsAG0AbgBvAHAAbgBwAHEAcgBzAHQAcgB0AHUAdgB3AHgAdgB4AHkAegB7AHwAegB8AH0AfgB/AIAAfgCAAIEAggCDAIQAggCEAIUAhgCHAIgAhgCIAIkAigCLAIwAigCMAI0AjgCPAJAAjgCQAJEAkgCTAJQAkgCUAJUAlgCXAJgAlgCYAJkAAQCaAJsAAQCbAAIAnACdAJ4AnACeAJ8AoAChAKIAoACiAKMApAClAKYApACmAKcAqACpAKoAqACqAKsArACtAK4ArACuAK8AsACxALIAsACyALMAtAC1ALYAtAC2ALcAuAC5ALoAuAC6ALsAvAC9AL4AvAC+AL8AwADBAMIAwADCAMMAxADFAMYAxADGAMcAyADJAMoAyADKAMsAzADNAM4AzADOAM8A0ADRANIA0ADSANMA1ADVANYA1ADWANcA2ADZANoA2ADaANsA3ADdAN4A3ADeAN8A4ADhAOIA4ADiAOMA5ADlAOYA5ADmAOcA6ADpAOoA6ADqAOsA7ADtAO4A7ADuAO8A8ADxAPIA8ADyAPMA9AD1APYA9AD2APcA+AD5APoA+AD6APsA/AD9AP4A/AD+AP8AAAEBAQIBAAECAQMBBAEFAQYBBAEGAQcBCAEJAQoBCAEKAQsBDAENAQ4BDAEOAQ8B"),
"material": ExtResource("3_p5t2c"),
"material": ExtResource("5_1sdvq"),
"primitive": 3,
"uv_scale": Vector4(0, 0, 0, 0),
"vertex_count": 272,
@ -30,7 +30,7 @@ _surfaces = [{
"format": 34359742519,
"index_count": 6,
"index_data": PackedByteArray("AAABAAIAAAACAAMA"),
"material": ExtResource("4_28ffs"),
"material": ExtResource("6_h4ywl"),
"primitive": 3,
"uv_scale": Vector4(0, 0, 0, 0),
"vertex_count": 4,
@ -41,7 +41,7 @@ _surfaces = [{
"format": 34359742519,
"index_count": 30,
"index_data": PackedByteArray("AAABAAIAAAACAAMABAAFAAYABAAGAAcACAAJAAoACAAKAAsADAANAA4ADAAOAA8AEAARABIAEAASABMA"),
"material": ExtResource("5_xlrhi"),
"material": ExtResource("7_ap2uw"),
"primitive": 3,
"uv_scale": Vector4(0, 0, 0, 0),
"vertex_count": 20,
@ -52,7 +52,7 @@ _surfaces = [{
"format": 34359742519,
"index_count": 108,
"index_data": PackedByteArray("AAABAAIAAAACAAMABAAFAAYABAAGAAcACAAJAAoACAAKAAsADAANAA4ADAAOAA8AEAARABIAEAASABMAFAAVABYAFAAWABcAGAAZABoAGAAaABsAHAAdAB4AHAAeAB8AIAAhACIAIAAiACMAJAAlACYAJAAmACcAKAApACoAKAAqACsALAAtAC4ALAAuAC8AMAAxADIAMAAyADMANAA1ADYANAA2ADcAOAA5ADoAOAA6ADsAPAA9AD4APAA+AD8AQABBAEIAQABCAEMARABFAEYARABGAEcA"),
"material": ExtResource("6_jy4sn"),
"material": ExtResource("8_v6ly3"),
"primitive": 3,
"uv_scale": Vector4(0, 0, 0, 0),
"vertex_count": 72,
@ -124,18 +124,19 @@ exposure_multiplier = 2.641
[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")
local_player = ExtResource("1_wffmg")
remote_player = ExtResource("2_msi5w")
[node name="func_godot_map" type="Node3D" parent="." unique_id=473152478]
script = ExtResource("1_yr1i7")
script = ExtResource("3_jyww1")
local_map_file = "uid://dsp1f8bvpwlfa"
map_settings = ExtResource("2_j6hgl")
map_settings = ExtResource("4_1d2sd")
build_flags = 1
metadata/_custom_type_script = "uid://cwu5cf7a0awcd"
[node name="entity_0_worldspawn" type="StaticBody3D" parent="func_godot_map" unique_id=2012876075]
collision_mask = 0
collision_layer = 7
collision_mask = 7
[node name="entity_0_mesh_instance" type="MeshInstance3D" parent="func_godot_map/entity_0_worldspawn" unique_id=428047591]
mesh = SubResource("ArrayMesh_p5t2c")
@ -197,14 +198,14 @@ quality = 3
supersampling = true
bounces = 1
directional = true
light_data = ExtResource("4_j6hgl")
light_data = ExtResource("9_g8xwm")
[node name="directional_light_3d" type="DirectionalLight3D" parent="." unique_id=1139155817]
transform = Transform3D(0.81574994, -0.42455062, 0.39282152, 0, 0.6791465, 0.73400277, -0.57840466, -0.5987627, 0.5540137, 0, 2.9586372, 0)
light_bake_mode = 1
shadow_enabled = true
[node name="lightmap_timestamp_checker" parent="." unique_id=400431685 instance=ExtResource("8_p5t2c")]
[node name="lightmap_timestamp_checker" parent="." unique_id=400431685 instance=ExtResource("10_gpyxh")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0)
[node name="spawner" type="Node3D" parent="." unique_id=2117785064]

2
godot/scenes/game_manager.tscn
View File

@ -1,7 +1,7 @@
[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"]
[ext_resource type="MapResource" uid="uid://bsjoandgu476y" path="res://maps/diner/diner.tres" id="2_glms7"]
[node name="game_manager" type="GameManager" unique_id=1442044769]
respawn_timer = 10.0