cs-os
/
cs-os
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 3 Wiki Activity

changed test_map, small improvements

This commit is contained in:
leca 2024-02-17 14:54:16 +03:00
parent fd0afcc42a
commit df7ad936f8
3 changed files with 283 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

292
scenes/test_map.tscn
View File

@ -66,25 +66,295 @@ use_collision = true
size = Vector3(10, 0.1, 10)
[node name="CSGBox3D10" type="CSGBox3D" parent="terrain"]
transform = Transform3D(-4.37114e-08, -1, 0, 1, -4.37114e-08, 0, 0, 0, 1, 15, 5, -10)
material_override = SubResource("StandardMaterial3D_68arr")
use_collision = true
size = Vector3(10, 0.1, 10)
[node name="CSGBox3D11" type="CSGBox3D" parent="terrain"]
transform = Transform3D(-4.37114e-08, -1, 0, 1, -4.37114e-08, 0, 0, 0, 1, 15, 5, 0)
material_override = SubResource("StandardMaterial3D_68arr")
use_collision = true
size = Vector3(10, 0.1, 10)
[node name="CSGBox3D12" type="CSGBox3D" parent="terrain"]
transform = Transform3D(8.9407e-08, 1, 0, -1, 8.9407e-08, 0, 0, 0, 1, 15, 5, 10)
[node name="CSGBox3D11" type="CSGBox3D" parent="terrain"]
transform = Transform3D(-4.37114e-08, -1, 0, 1, -4.37114e-08, 0, 0, 0, 1, 15, 5, 10)
material_override = SubResource("StandardMaterial3D_68arr")
use_collision = true
size = Vector3(10, 0.1, 10)
[node name="CSGBox3D13" type="CSGBox3D" parent="terrain"]
transform = Transform3D(-1, 1.78814e-07, 0, -1.26441e-07, -0.707107, -0.707107, -1.26441e-07, -0.707107, 0.707107, 10, 14.3726, -29.4839)
[node name="CSGBox3D12" type="CSGBox3D" parent="terrain"]
transform = Transform3D(8.9407e-08, 1, 0, -1, 8.9407e-08, 0, 0, 0, 1, 15, 5, 20)
material_override = SubResource("StandardMaterial3D_68arr")
use_collision = true
size = Vector3(10, 0.09425, 57.5945)
size = Vector3(10, 0.1, 10)
[node name="CSGBox3D14" type="CSGBox3D" parent="terrain"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 30)
material_override = SubResource("StandardMaterial3D_68arr")
use_collision = true
size = Vector3(10, 0.1, 10)
[node name="CSGBox3D15" type="CSGBox3D" parent="terrain"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 20)
material_override = SubResource("StandardMaterial3D_68arr")
use_collision = true
size = Vector3(10, 0.1, 10)
[node name="CSGBox3D16" type="CSGBox3D" parent="terrain"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 40)
material_override = SubResource("StandardMaterial3D_68arr")
use_collision = true
size = Vector3(10, 0.1, 10)
[node name="CSGBox3D17" type="CSGBox3D" parent="terrain"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 10, 0, 30)
material_override = SubResource("StandardMaterial3D_68arr")
use_collision = true
size = Vector3(10, 0.1, 10)
[node name="CSGBox3D18" type="CSGBox3D" parent="terrain"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 10, 0, 20)
material_override = SubResource("StandardMaterial3D_68arr")
use_collision = true
size = Vector3(10, 0.1, 10)
[node name="CSGBox3D19" type="CSGBox3D" parent="terrain"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 10, 0, 40)
material_override = SubResource("StandardMaterial3D_68arr")
use_collision = true
size = Vector3(10, 0.1, 10)
[node name="CSGBox3D20" type="CSGBox3D" parent="terrain"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -10, 0, 20)
material_override = SubResource("StandardMaterial3D_68arr")
use_collision = true
size = Vector3(10, 0.1, 10)
[node name="CSGBox3D21" type="CSGBox3D" parent="terrain"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -10, 0, 30)
material_override = SubResource("StandardMaterial3D_68arr")
use_collision = true
size = Vector3(10, 0.1, 10)
[node name="CSGBox3D22" type="CSGBox3D" parent="terrain"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -10, 0, 40)
material_override = SubResource("StandardMaterial3D_68arr")
use_collision = true
size = Vector3(10, 0.1, 10)
[node name="CSGBox3D23" type="CSGBox3D" parent="terrain"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 30, 4.45, 0)
material_override = SubResource("StandardMaterial3D_68arr")
use_collision = true
size = Vector3(10, 9, 10)
[node name="CSGBox3D24" type="CSGBox3D" parent="terrain"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 30, 5.45, -10)
material_override = SubResource("StandardMaterial3D_68arr")
use_collision = true
size = Vector3(10, 11, 10)
[node name="CSGBox3D25" type="CSGBox3D" parent="terrain"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 30, 3.45, 10)
material_override = SubResource("StandardMaterial3D_68arr")
use_collision = true
size = Vector3(10, 7, 10)
[node name="CSGBox3D26" type="CSGBox3D" parent="terrain"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 40, 0, 0)
material_override = SubResource("StandardMaterial3D_68arr")
use_collision = true
size = Vector3(10, 0.1, 10)
[node name="CSGBox3D27" type="CSGBox3D" parent="terrain"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 40, 0, -10)
material_override = SubResource("StandardMaterial3D_68arr")
use_collision = true
size = Vector3(10, 0.1, 10)
[node name="CSGBox3D28" type="CSGBox3D" parent="terrain"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 40, 0, 10)
material_override = SubResource("StandardMaterial3D_68arr")
use_collision = true
size = Vector3(10, 0.1, 10)
[node name="CSGBox3D29" type="CSGBox3D" parent="terrain"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 20, 0, -10)
material_override = SubResource("StandardMaterial3D_68arr")
use_collision = true
size = Vector3(10, 0.1, 10)
[node name="CSGBox3D30" type="CSGBox3D" parent="terrain"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 20, 0, 0)
material_override = SubResource("StandardMaterial3D_68arr")
use_collision = true
size = Vector3(10, 0.1, 10)
[node name="CSGBox3D31" type="CSGBox3D" parent="terrain"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 20, 0, 10)
material_override = SubResource("StandardMaterial3D_68arr")
use_collision = true
size = Vector3(10, 0.1, 10)
[node name="CSGBox3D32" type="CSGBox3D" parent="terrain"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 30, 1.45, 30)
material_override = SubResource("StandardMaterial3D_68arr")
use_collision = true
size = Vector3(10, 3, 10)
[node name="CSGBox3D33" type="CSGBox3D" parent="terrain"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 30, 2.45, 20)
material_override = SubResource("StandardMaterial3D_68arr")
use_collision = true
size = Vector3(10, 5, 10)
[node name="CSGBox3D34" type="CSGBox3D" parent="terrain"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 30, 0, 40)
material_override = SubResource("StandardMaterial3D_68arr")
use_collision = true
size = Vector3(10, 0.1, 10)
[node name="CSGBox3D35" type="CSGBox3D" parent="terrain"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 40, 0, 30)
material_override = SubResource("StandardMaterial3D_68arr")
use_collision = true
size = Vector3(10, 0.1, 10)
[node name="CSGBox3D36" type="CSGBox3D" parent="terrain"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 40, 0, 20)
material_override = SubResource("StandardMaterial3D_68arr")
use_collision = true
size = Vector3(10, 0.1, 10)
[node name="CSGBox3D37" type="CSGBox3D" parent="terrain"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 40, 0, 40)
material_override = SubResource("StandardMaterial3D_68arr")
use_collision = true
size = Vector3(10, 0.1, 10)
[node name="CSGBox3D38" type="CSGBox3D" parent="terrain"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 20, 0, 20)
material_override = SubResource("StandardMaterial3D_68arr")
use_collision = true
size = Vector3(10, 0.1, 10)
[node name="CSGBox3D39" type="CSGBox3D" parent="terrain"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 20, 0, 30)
material_override = SubResource("StandardMaterial3D_68arr")
use_collision = true
size = Vector3(10, 0.1, 10)
[node name="CSGBox3D40" type="CSGBox3D" parent="terrain"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 20, 0, 40)
material_override = SubResource("StandardMaterial3D_68arr")
use_collision = true
size = Vector3(10, 0.1, 10)
[node name="CSGBox3D41" type="CSGBox3D" parent="terrain"]
transform = Transform3D(-1, 8.74228e-08, 0, -8.74228e-08, -1, 0, 0, 0, 1, 20, 10.9505, -10)
material_override = SubResource("StandardMaterial3D_68arr")
use_collision = true
size = Vector3(10, 0.001, 10)
[node name="CSGBox3D42" type="CSGBox3D" parent="terrain"]
transform = Transform3D(-0.866025, 0.5, -2.18557e-08, 7.81621e-15, 4.37114e-08, 1, 0.5, 0.866025, -3.78552e-08, 10.7701, 5, 27.5243)
material_override = SubResource("StandardMaterial3D_68arr")
use_collision = true
size = Vector3(10, 0.1, 10)
[node name="CSGBox3D43" type="CSGBox3D" parent="terrain"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 50, 0, 0)
material_override = SubResource("StandardMaterial3D_68arr")
use_collision = true
size = Vector3(10, 0.1, 10)
[node name="CSGBox3D44" type="CSGBox3D" parent="terrain"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 50, 0, -10)
material_override = SubResource("StandardMaterial3D_68arr")
use_collision = true
size = Vector3(10, 0.1, 10)
[node name="CSGBox3D45" type="CSGBox3D" parent="terrain"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 50, 0, 10)
material_override = SubResource("StandardMaterial3D_68arr")
use_collision = true
size = Vector3(10, 0.1, 10)
[node name="CSGBox3D46" type="CSGBox3D" parent="terrain"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 50, 0, 30)
material_override = SubResource("StandardMaterial3D_68arr")
use_collision = true
size = Vector3(10, 0.1, 10)
[node name="CSGBox3D47" type="CSGBox3D" parent="terrain"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 50, 0, 20)
material_override = SubResource("StandardMaterial3D_68arr")
use_collision = true
size = Vector3(10, 0.1, 10)
[node name="CSGBox3D48" type="CSGBox3D" parent="terrain"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 50, 0, 40)
material_override = SubResource("StandardMaterial3D_68arr")
use_collision = true
size = Vector3(10, 0.1, 10)
[node name="CSGBox3D49" type="CSGBox3D" parent="terrain"]
transform = Transform3D(1, 0, 0, 0, -4.37114e-08, -1, 0, 1, -4.37114e-08, 20.0062, 34.7236, -15)
material_override = SubResource("StandardMaterial3D_68arr")
use_collision = true
size = Vector3(70, 0.1, 70)
[node name="CSGBox3D50" type="CSGBox3D" parent="terrain"]
transform = Transform3D(-4.37114e-08, 1, 0, -1, -4.37114e-08, 0, 0, 0, 1, 55, 35, 20)
material_override = SubResource("StandardMaterial3D_68arr")
use_collision = true
size = Vector3(70, 0.1, 70)
[node name="CSGBox3D51" type="CSGBox3D" parent="terrain"]
transform = Transform3D(-1, -8.74228e-08, 3.82137e-15, 0, -4.37114e-08, -1, 8.74228e-08, -1, 4.37114e-08, 20.0062, 35.0854, 54.7096)
material_override = SubResource("StandardMaterial3D_68arr")
use_collision = true
size = Vector3(70, 0.1, 70)
[node name="CSGBox3D52" type="CSGBox3D" parent="terrain"]
transform = Transform3D(4.37114e-08, -1, -8.74228e-08, -1, -4.37114e-08, 0, -3.55271e-15, 8.74228e-08, -1, -14.6409, 35.1291, 20.3618)
material_override = SubResource("StandardMaterial3D_68arr")
use_collision = true
size = Vector3(70, 0.1, 70)
[node name="CSGBox3D53" type="CSGBox3D" parent="terrain"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.0588226, 0.0249977, 49.9649)
material_override = SubResource("StandardMaterial3D_68arr")
use_collision = true
size = Vector3(10, 0.1, 10)
[node name="CSGBox3D54" type="CSGBox3D" parent="terrain"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 10.0588, 0.0249977, 49.9649)
material_override = SubResource("StandardMaterial3D_68arr")
use_collision = true
size = Vector3(10, 0.1, 10)
[node name="CSGBox3D55" type="CSGBox3D" parent="terrain"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -9.94118, 0.0249977, 49.9649)
material_override = SubResource("StandardMaterial3D_68arr")
use_collision = true
size = Vector3(10, 0.1, 10)
[node name="CSGBox3D56" type="CSGBox3D" parent="terrain"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 30.0588, 0.0249977, 49.9649)
material_override = SubResource("StandardMaterial3D_68arr")
use_collision = true
size = Vector3(10, 0.1, 10)
[node name="CSGBox3D57" type="CSGBox3D" parent="terrain"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 40.0588, 0.0249977, 49.9649)
material_override = SubResource("StandardMaterial3D_68arr")
use_collision = true
size = Vector3(10, 0.1, 10)
[node name="CSGBox3D58" type="CSGBox3D" parent="terrain"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 20.0588, 0.0249977, 49.9649)
material_override = SubResource("StandardMaterial3D_68arr")
use_collision = true
size = Vector3(10, 0.1, 10)
[node name="CSGBox3D59" type="CSGBox3D" parent="terrain"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 50.0588, 0.0249977, 49.9649)
material_override = SubResource("StandardMaterial3D_68arr")
use_collision = true
size = Vector3(10, 0.1, 10)

2
scripts/Networking.gd
View File

@ -150,7 +150,7 @@ func shot(client_id):
target_client["HP"] -= 10;
if (target_client["HP"] == 0):
target_cb3d.teleport.rpc_id(int(clients.find_key(target_client)), Vector3(0, 100, 0))
target_cb3d.teleport.rpc_id(int(clients.find_key(target_client)), Vector3(0, 10, 0))
target_client["HP"] = 100
target_cb3d.set_hp.rpc_id(int(clients.find_key(target_client)), target_client["HP"])
print(str(target_client))

2
settings/server-settings.json
View File

@ -6,7 +6,7 @@
"moving": {
"walk": 12,
"run": 24,
"gravity": 2,
"gravity": 9.8,
"jump": 12
}
}